git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3a66aa
25e4b48
)
Merge branch 'bcmring/removal' into next/multiplatform
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 28 Sep 2012 19:51:22 +0000
(21:51 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 28 Sep 2012 19:51:38 +0000
(21:51 +0200)
The removal of bcmring has non-obvious commits with the way the
multiplatform configuration works, so merge it in here.
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff