From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 2 Oct 2014 15:08:24 +0000 (+0200)
Subject: Merge tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu into next/dt
X-Git-Tag: v3.18-rc1~119^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4394a0014597bd53e2d9bbc69d091e3fbde7d00c;p=~emulex%2Finfiniband.git

Merge tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu into next/dt

Pull "mvebu DT changes for v3.18 (round 2)" from Jason Cooper:

 - Armada XP
    - Add HW datasheet references to docs

 - Armada 370
    - Change internal registers to 0xf1000000 for Armada 370 RD board

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'mvebu-dt-3.18-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: switch the Armada 370 RD board to internal registers at 0xf1000000
  Documentation: arm: add hardware datasheet reference for Marvell Armada XP
---

4394a0014597bd53e2d9bbc69d091e3fbde7d00c