Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard...
authorNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 19 Aug 2014 21:04:10 +0000 (16:04 -0500)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Tue, 19 Aug 2014 21:04:10 +0000 (16:04 -0500)
commit464d6e18639c4347dafd8dbcee270674dd3d8fba
treed4c317831e7193ecb586734a962a618961b638f9
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9
parent16aa7f1f173f3ca105296cf2709cb039c99ffe4a
Merge tag 'at91-dt-for-3.17' of git://git./linux/kernel/git/mripard/linux

Pull AT91 ramc and reset/poweroff related DT patches from Maxim Ripard:
 "This branch gathers a few devicetree patches needed for the reworks found in
  the later patches to be sent. More precisely, it holds:
    - The addition of ddrck for the sama5d3 and the sam9 SoCs
    - The addition of the shutdown controller node in the sama5d3 DTSI
    - The slight rework of the ramc bindings for the SoCs that have several RAM
      controllers"

Conflicts:
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/sama5d3.dtsi