Merge tag 'dt-3.11-6' of git://git.infradead.org/users/jcooper/linux into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 17:54:13 +0000 (19:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Jun 2013 17:54:13 +0000 (19:54 +0200)
commitf7bea65be78ca165c6b44f28497ae6f5dfc7db26
tree12f50b821bdb3c5ef0d469da1b1f10099137ce89
parent7aaa1e8c5efd01d9dc8e863c77902291247f88bb
parent01db527e657d6cf646c6e6f059ad41e7023a25e7
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>