Arnd Bergmann 321081f5f5 Merge branch 'sunxi/dt' into next/dt
This avoids a boot regression

* sunxi/dt:
  Revert "ARM: dts: sunxi: unify APB1 clock"
  Revert "ARM: dts: sunxi: Use sun4i-a10-apb1-clk for sun6i/sun8i apb2 clocks."

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-11-27 16:05:30 +01:00
..
2014-11-27 16:05:30 +01:00