From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 10 May 2012 16:55:44 +0000 (+0300)
Subject: Merge branch 'for-l-o-3.5'
X-Git-Tag: v3.5-rc1~7^2~5^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262;p=pandora-kernel.git

Merge branch 'for-l-o-3.5'

Conflicts:
	drivers/video/omap2/displays/panel-taal.c

Merge OMAP DSS related board file changes. The branch will also be
merged through linux-omap tree to solve conflicts.
---

9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262
Reading git-diff-tree failed