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)
commit474ff6b8a79093aea966b6246d5b8000de124da9
treec73caeaeef6d800ca8795687294ed2cbd74607db
parent9b76c9cdece2b14a23bfddd765f6dac1dd4d0120
parent8ad9375f8b7c709b89f7de4de413bb2644ba3c24
Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux

omapdss fixes for 3.7-rc

Conflicts:
drivers/video/omap2/dss/dss.c
drivers/video/omap2/dss/dss.c
drivers/video/omap2/omapfb/omapfb-ioctl.c