]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'cortex/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:17:55 +0000 (16:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 05:17:55 +0000 (16:17 +1100)
commit061e349f2b8a7b05c079196da20eb7567cacfa3c
tree165f5762ac486bd064cd07339a587e195934a6b9
parentd5246aa48b43c4788b7ddae44e58e3f5b4b6f90a
parent6ebd4d038dbb626a43d87db3007e71f92f49d7b3
Merge remote-tracking branch 'cortex/for-next'

Conflicts:
arch/arm/include/asm/cputype.h
arch/arm/Kconfig
arch/arm/include/asm/cputype.h
arch/arm/kernel/smp_scu.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mm/Kconfig
arch/arm/mm/mmu.c