review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1dfafbc e4a9e94)

author	Tomi Valkeinen <tomi.valkeinen@ti.com>
	Thu, 10 May 2012 16:55:44 +0000 (19:55 +0300)
committer	Tomi Valkeinen <tomi.valkeinen@ti.com>
	Thu, 10 May 2012 17:24:14 +0000 (20:24 +0300)
commit	9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262
tree	d034047d7cd562700c59a0b1b3ba707367939fe7	tree \| snapshot
parent	1dfafbc655b3723e37120d4b30e82d1c87767dd1	commit \| diff
parent	e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/video/omap2/dss/dsi.c	diff1 \|	diff2 \|	blob \| history
include/video/omapdss.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;