projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1940cb da1a759)
Merge branch 'sunxi/dt' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 27 Nov 2014 15:05:30 +0000 (16:05 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Nov 2014 15:05:30 +0000 (16:05 +0100)
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>

Trivial merge