]> 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)
commitd80a888d06da6fcc64d562a51677b6905eab8e4e
treeba98513f6b5d676980145fef7092910141009eaa
parent0eacd9b5e45119d79e75c855dbcfc3a07b26bc48
parent6bd828c28453a3c48c9c6a96a5d0918f2e39a77f
Merge branch 'bcm/cleanup' into next/soc

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