Merge branch 'bcm/cleanup' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:44:17 +0000 (00:44 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:44:17 +0000 (00:44 +0200)
Conflicts:
arch/arm/mach-bcm/Kconfig


Trivial merge