diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-20 23:24:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-20 23:30:43 -0700 |
| commit | 4ae608e137a8b0e5a34a4f4c409f8468b4685df9 (patch) | |
| tree | bcf6d77bc52d5578a59bc3768677e07c0ff8f9db /Documentation | |
| parent | 6ec3240047ee6a4b34f90d45e19ed179bc9b4a2e (diff) | |
| parent | 00ed4a0bd964555fe9276f2299564c384d50ae7d (diff) | |
| download | linux-3.10-4ae608e137a8b0e5a34a4f4c409f8468b4685df9.tar.gz linux-3.10-4ae608e137a8b0e5a34a4f4c409f8468b4685df9.tar.bz2 linux-3.10-4ae608e137a8b0e5a34a4f4c409f8468b4685df9.zip | |
Merge tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux into fixes
From Jason Cooper, mvebu fixes for v3.10:
- mvebu
- duplicate alias removal
- augment new internal-regs dt node with proper ranges node
- kirkwood
- stable fix for QNAP TS-11x/TS-21x enabling PCIe port 1
- plat-orion
- missing ehci include in common.h. needed within common.h.
* tag 'fixes-3.10-1' of git://git.infradead.org/users/jcooper/linux:
ARM: mvebu: Add a ranges entry to translate devbus childs
ARM: plat-orion: add missing ehci include to common.h
Kirkwood: Enable PCIe port 1 on QNAP TS-11x/TS-21x
ARM: mvebu: do not duplicate the mpic alias
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions