Merge branch 'smp' into misc
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:31:35 +0000 (22:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:32:03 +0000 (22:32 +0000)
commit4ec3eb13634529c0bc7466658d84d0bbe3244aea
treeb491daac2ccfc7b8ca88e171a43f66888463568a
parent24056f525051a9e186af28904b396320e18bf9a0
parent15095bb0fe779c0403091bda7adce5fb3bb9ca35
Merge branch 'smp' into misc

Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
17 files changed:
arch/arm/Kconfig
arch/arm/include/asm/assembler.h
arch/arm/include/asm/entry-macro-multi.S
arch/arm/include/asm/mach/irq.h
arch/arm/kernel/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/kernel/fiq.c
arch/arm/kernel/irq.c
arch/arm/kernel/traps.c
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/clock-sh7372.c
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mm/dma-mapping.c
arch/sh/Kconfig
arch/sh/kernel/cpu/sh4/clock-sh4-202.c
arch/sh/kernel/cpu/sh4a/clock-sh7724.c
drivers/Makefile