]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:02:03 +0000 (11:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:02:03 +0000 (11:02 +1000)
commit8bebe81cbfb379b7d790f2f480ee1a67c6c7a9b5
tree653900257b985732f96292ebc12e0c701097a1d4
parent1887dee65570cf233022a9714b493952d8ba2444
parentf537d068a864d26708786f64307c962ee2731ab4
Merge remote-tracking branch 'arm/for-next'

Conflicts:
arch/arm/include/asm/timex.h
arch/arm/kernel/smp.c
arch/arm/mach-integrator/integrator_cp.c
15 files changed:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/include/asm/io.h
arch/arm/include/asm/timex.h
arch/arm/kernel/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/mach-exynos/platsmp.c
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-shmobile/smp-emev2.c
arch/arm/mm/cache-l2x0.c
arch/arm/mm/ioremap.c