From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 22 Mar 2011 05:27:36 +0000 (+0900)
Subject: Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: v2.6.39-rc1~98^2~58
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da49252fb0392d8196833ef3da92e48fb371f8d7;p=pandora-kernel.git

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

Conflicts:
	arch/arm/mach-omap2/board-overo.c

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

da49252fb0392d8196833ef3da92e48fb371f8d7
Reading git-diff-tree failed