Merge branch 'for-l-o-3.5'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 10 May 2012 16:55:44 +0000 (19:55 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 10 May 2012 17:24:14 +0000 (20:24 +0300)
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.


Trivial merge