projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d1940cb
da1a759
)
Merge branch 'sunxi/dt' into next/dt
author
Arnd Bergmann
<
[email protected]
>
Thu, 27 Nov 2014 15:05:30 +0000
(16:05 +0100)
committer
Arnd Bergmann
<
[email protected]
>
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 <
[email protected]
>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff