diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 21:54:13 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 21:54:13 +0400 |
commit | f7bea65be78ca165c6b44f28497ae6f5dfc7db26 (patch) | |
tree | 12f50b821bdb3c5ef0d469da1b1f10099137ce89 /include/linux/lcm.h | |
parent | 7aaa1e8c5efd01d9dc8e863c77902291247f88bb (diff) | |
parent | 01db527e657d6cf646c6e6f059ad41e7023a25e7 (diff) | |
download | linux-f7bea65be78ca165c6b44f28497ae6f5dfc7db26.tar.xz |
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>
Diffstat (limited to 'include/linux/lcm.h')
0 files changed, 0 insertions, 0 deletions