| commit | df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Sep 28 21:51:22 2012 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Sep 28 21:51:38 2012 +0200 |
| tree | 8f7587ab9a24a3c04afe842c3a7d51cb2c31a1cc | |
| parent | e3a66aa33a8f06924f67770e15c22a5c52df314e [diff] | |
| parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 [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>