| commit | 614cd4a4ac3daf725508e372bce2160e2d8039a9 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sat Mar 08 22:09:23 2014 -0800 |
| committer | Olof Johansson <olof@lixom.net> | Sat Mar 08 22:09:23 2014 -0800 |
| tree | 1c6dd9f7b7ec425b19e432bc1b34f30f69dd2d3e | |
| parent | 014325e933b43844f5d01fcef39bbc3301320e59 [diff] | |
| parent | 40dd8f3b900cac1d925605a9d3199368c4af0a40 [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>