From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 20 Dec 2010 15:40:51 +0000 (+0900)
Subject: Merge branch 'rmobile/urgent' into rmobile-latest
X-Git-Tag: v2.6.38-rc1~462^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bcee1832d23869c2cdb6886ae5210b0143256f0;p=pandora-kernel.git

Merge branch 'rmobile/urgent' into rmobile-latest

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

8bcee1832d23869c2cdb6886ae5210b0143256f0
Reading git-diff-tree failed