projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e3a66aa 25e4b48)
Merge branch 'bcmring/removal' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 19:51:22 +0000 (21:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 19:51:38 +0000 (21:51 +0200)
commitdf69a4627eb5de58ec71fdf6a7b5d0ce9410d57e
tree8f7587ab9a24a3c04afe842c3a7d51cb2c31a1cctree | snapshot
parente3a66aa33a8f06924f67770e15c22a5c52df314ecommit | diff
parent25e4b485fb8eeda8aa7a2e1e45fbb31538565117commit | diff
Merge branch 'bcmring/removal' into next/multiplatform

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>
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/Kconfig diff1 | diff2 | blob | history
arch/arm/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.