]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'misc' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 8 Oct 2011 12:00:14 +0000 (13:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 8 Oct 2011 12:00:14 +0000 (13:00 +0100)
commitfc6c559e73b3183ea6d9856dca09959891fa6069
tree5c9cc9a71b68c807fa5ef8f488af6e0664f7ea8a
parentf59e8ea9bebc01fc5b90f882134c54049545d6ba
parentdaceaaeeb79571ed5b6c242801e80e3183b1b23d
Merge branch 'misc' into for-next

Conflicts:
arch/arm/mach-integrator/integrator_ap.c
12 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/io.h
arch/arm/include/asm/localtimer.h
arch/arm/kernel/Makefile
arch/arm/kernel/smp_scu.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-pxa/irq.c
arch/arm/mach-sa1100/Makefile