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)
commit80e98a9ca6ded6d0fb6c2362c07638cbe3c58e2c
treeba98513f6b5d676980145fef7092910141009eaa
parent3c2580173e3bc820a8f8c0db968f757b8eca7fe5
parenteeda4cb92ee0fb63a5917738e107b0bc8168079e
Merge branch 'bcm/cleanup' into next/soc

Conflicts:
arch/arm/mach-bcm/Kconfig
arch/arm/mach-bcm/Kconfig