]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 23 Oct 2011 20:26:22 +0000 (21:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 23 Oct 2011 20:26:22 +0000 (21:26 +0100)
commit8122ad4a288ecac39063af10d260e9b5f44daaf2
tree41c008d9e77b718f680f0690daaeaba48582ba79
parent2a6071fae2ebb3601152a40a95b57c50ccf6d576
parenteb0474544bc16a9dab53b26abd846e86ba814eb1
Merge branch 'misc' into for-next

Conflicts:
arch/arm/mach-integrator/integrator_ap.c
arch/arm/Kconfig
arch/arm/include/asm/io.h
arch/arm/include/asm/system.h
arch/arm/kernel/smp.c
arch/arm/kernel/traps.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-mmp/aspenite.c
arch/arm/mach-msm/board-sapphire.c
arch/arm/mach-sa1100/Makefile