| commit | 37177faefc22209deb547579d4c2dfd5d6bf30ab | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Jun 14 18:42:59 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Jun 14 18:42:59 2013 -0700 |
| tree | 6e2970f7d122ac93bc80000727fa6d0fa87d1e9c | |
| parent | 36d29fb57ccbf3cea2e46fea2ef5f0ffc22308e4 [diff] | |
| parent | 39138bc60f90560ac79e76fb0971be5619ae32d7 [diff] |
Merge tag 'sunxi-dt-for-3.11' of git://github.com/mripard/linux into next/dt 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>