Merge branch 'rmobile/smp' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Fri, 7 Jan 2011 01:51:35 +0000 (10:51 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 7 Jan 2011 01:51:35 +0000 (10:51 +0900)
commite9d728f528f9548c8dd013899b23e662fa7b6bca
treed88a5df6e5a2b33ebe088ad0223fe54679a59df3
parent018a3fc7e3824ffcc80ad0160f9782c7d577c0c1
parent6155f77d09b968f591876f368d4843168910449e
Merge branch 'rmobile/smp' into rmobile-latest

Conflicts:
arch/arm/Kconfig
arch/arm/mach-shmobile/include/mach/entry-macro-intc.S

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/include/mach/common.h