Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes
authorOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:09:23 +0000 (22:09 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 9 Mar 2014 06:09:23 +0000 (22:09 -0800)
Allwinner fixes from Maxime Ripard:

Two fixes for device trees additions that got added in 3.14. One fixes the
interrupt types of some IPs, the other fixes up a compatible that got
introduced during 3.14

* tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux:
  ARM: sunxi: dt: Change the touchscreen compatibles
  ARM: sun7i: dt: Fix interrupt trigger types

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

Simple merge
Simple merge
Simple merge