| commit | f7bea65be78ca165c6b44f28497ae6f5dfc7db26 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Jun 21 19:54:13 2013 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Jun 21 19:54:13 2013 +0200 |
| tree | 12f50b821bdb3c5ef0d469da1b1f10099137ce89 | |
| parent | 7aaa1e8c5efd01d9dc8e863c77902291247f88bb [diff] | |
| parent | 01db527e657d6cf646c6e6f059ad41e7023a25e7 [diff] |
Merge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into next/dt
From Jason Cooper:
mvebu dt changes for v3.11 (round 6)
- mvebu
- mini-PCIe connectors on Armada 370 RD
- kirkwood
- correct internal register ranges translation
* tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux:
ARM: Kirkwood: Fix the internal register ranges translation
arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
Signed-off-by: Arnd Bergmann <arnd@arndb.de>