Merge tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux into next/dt
authorOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:42:59 +0000 (18:42 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 01:42:59 +0000 (18:42 -0700)
From Maxime Ripard:
Allwinner SoCs DT additions for 3.11
  - Switch to using the sun5i clocks for the A13
  - Register the pio node as an interrupt controller

* tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux:
  ARM: sunxi: dt: Register the pio node as interrupt controller
  ARM: sun5i: Update the clock compatible strings

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/boot/dts/sun5i-a13.dtsi

Simple merge
Simple merge