tree d88a5df6e5a2b33ebe088ad0223fe54679a59df3
parent 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1
parent 6155f77d09b968f591876f368d4843168910449e
author Paul Mundt <lethal@linux-sh.org> 1294365095 +0900
committer Paul Mundt <lethal@linux-sh.org> 1294365095 +0900

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>