From: Olof Johansson Date: Sun, 9 Mar 2014 06:09:23 +0000 (-0800) Subject: Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes X-Git-Tag: MMI-PSA29.97-13-9~12571^2~4 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=614cd4a4ac3daf725508e372bce2160e2d8039a9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes 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 --- 614cd4a4ac3daf725508e372bce2160e2d8039a9