git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 014325e 40dd8f3)
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)
commit614cd4a4ac3daf725508e372bce2160e2d8039a9
tree1c6dd9f7b7ec425b19e432bc1b34f30f69dd2d3etree
parent014325e933b43844f5d01fcef39bbc3301320e59commit | diff
parent40dd8f3b900cac1d925605a9d3199368c4af0a40commit | diff
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 <olof@lixom.net>
arch/arm/boot/dts/sun4i-a10.dtsi diff1 | diff2 | blob | history
arch/arm/boot/dts/sun5i-a10s.dtsi diff1 | diff2 | blob | history
arch/arm/boot/dts/sun7i-a20.dtsi diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.