]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/multiplatform' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:35:29 +0000 (22:35 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:35:29 +0000 (22:35 +0100)
commit699634e22cd1a004123dd561d751b9409c9f61dc
tree6a41ce698c86f029c445a8dceb24171e09e12347
parent07a6d6c3c2677d355056532d32c1c84ab7a3ad45
parent3a768d04639307dbebbbbc8f4216e3a06bc602d7
Merge branch 'next/multiplatform' into for-next

Conflicts:
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/mach-spear/Kconfig