• Nicolas Ferre's avatar
    Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux · 464d6e18
    Nicolas Ferre authored
    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
    464d6e18
at91sam9n12.dtsi 23.6 KB