From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 10 Jan 2012 08:10:55 +0000 (+0900)
Subject: Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest
X-Git-Tag: v3.3-rc1~90^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0a217a31a745421df98db0d14ebdadef11d734c;p=pandora-kernel.git

Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

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

f0a217a31a745421df98db0d14ebdadef11d734c
Reading git-diff-tree failed