]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4aa70772532790a01c8334b4cb1d486b1d981cb5
treed034047d7cd562700c59a0b1b3ba707367939fe7
parent7ea8bc74d139bbb6c831e94964ff900e97f61660
parent07e031759fb60723bc4deebaacc95c3db2351ebe
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