From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 7 Jan 2011 01:51:35 +0000 (+0900)
Subject: Merge branch 'rmobile/smp' into rmobile-latest
X-Git-Tag: v2.6.38-rc1~462^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9d728f528f9548c8dd013899b23e662fa7b6bca;p=pandora-kernel.git

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>
---

e9d728f528f9548c8dd013899b23e662fa7b6bca
Reading git-diff-tree failed