]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite5d3ab41540396f8b9a2882ad61348d39477b2a0
treee920c138ed83f3fc2aae43a074db6b88f09b89a9
parente0fd9cf9c276e68f6e8f262d9ace5156ce71294d
parent04f22bd51b514617731fc208822a24c5378e12a7
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>