]> 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)
commit1795004171d0645af39fe228a95b9bd7ba997242
treed034047d7cd562700c59a0b1b3ba707367939fe7
parentd95f1e6357dbcf5c908267276944ccd2ea8267ba
parent75bc87bbc42891bea2caa14856b8edda31b372bf
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