]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitda68d417c524d9f547ac4265ab735b850bd50cf0
treeba98513f6b5d676980145fef7092910141009eaa
parent3749ea97379c6275caf88a28fe2822c804baee9b
parent1f1fada6a2c44e1a6cacae827c236e5f769e6608
Merge branch 'bcm/cleanup' into next/soc

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