projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b76c9c 8ad9375)
Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 26 Nov 2012 08:26:29 +0000 (10:26 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 26 Nov 2012 08:26:29 +0000 (10:26 +0200)
omapdss fixes for 3.7-rc

Conflicts:
drivers/video/omap2/dss/dss.c

1  2 
drivers/video/omap2/dss/dss.c patch | diff1 | diff2 | blob | history
drivers/video/omap2/omapfb/omapfb-ioctl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/video/omap2/dss/dss.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git