git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5f2915 a937536)
Merge tag 'v3.9-rc3' into next/multiplatform
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 13:50:59 +0000 (15:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 14:01:23 +0000 (16:01 +0200)
Linux 3.9-rc3

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

This is a dependency for ux500/multiplatform

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Kconfig.debug
Simple merge
Pandora Kernel Repository