From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Tue, 19 Aug 2014 21:04:10 +0000 (-0500)
Subject: Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard... 
X-Git-Tag: fixes-for-v3.18-merge-window~4^2~35^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=464d6e18639c4347dafd8dbcee270674dd3d8fba;p=pandora-kernel.git

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
---

464d6e18639c4347dafd8dbcee270674dd3d8fba
Reading git-diff-tree failed