From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 5 Jan 2011 08:25:29 +0000 (+0900)
Subject: Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile... 
X-Git-Tag: v2.6.38-rc1~462^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=025a10a76808cfd9e55dbf965d0f1453e4f8ae84;p=pandora-kernel.git

Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig

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

025a10a76808cfd9e55dbf965d0f1453e4f8ae84
Reading git-diff-tree failed