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)
commit9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262
treed034047d7cd562700c59a0b1b3ba707367939fe7
parent1dfafbc655b3723e37120d4b30e82d1c87767dd1
parente4a9e94cc58ed6e4efb02b80be3a9bf57f448d07
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.
drivers/video/omap2/displays/panel-taal.c
drivers/video/omap2/dss/dsi.c
include/video/omapdss.h