Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 25 Oct 2011 07:19:59 +0000 (08:19 +0100)
commitbdf4e9482360a3ddc1619efbd5d1c928ede8c3fa
treeb02319e809c5b8abfca85409a11472775e27f597
parent06afb1a087d49ae0f676b2e5b9ffe5f4b3aba355
parenteb0474544bc16a9dab53b26abd846e86ba814eb1
Merge branch 'misc' into for-linus

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