From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2012 17:26:43 +0000 (+0000)
Subject: Merge branch 'renesas/fixes' into renesas/soc
X-Git-Tag: v3.4-rc1~89^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cd9eb2736a572a9ef2689829f47ffd4262adc00;p=pandora-kernel.git

Merge branch 'renesas/fixes' into renesas/soc

The fixes branch was merged into mainline just after v3.3-rc7,
I'm merging it into this branch to fix up a nontrivial merge
conflict. Unfortunately this means that we are now based on
a commit between -rc releases, which we normally try to avoid.

Conflicts:
	arch/arm/mach-shmobile/board-mackerel.c

Resolution suggested by Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

5cd9eb2736a572a9ef2689829f47ffd4262adc00
Reading git-diff-tree failed