projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit321081f5f5ad40880d2a92dedd07052ea2a25516
treee920c138ed83f3fc2aae43a074db6b88f09b89a9tree | snapshot
parentd1940cbd4687ea517801ef5c861e8625450e7285commit | diff
parentda1a7592132eb8f71056bd168fccbe2801c5d697commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.