From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Mon, 26 Nov 2012 08:26:29 +0000 (+0200)
Subject: Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux
X-Git-Tag: v3.8-rc1~96^2^2~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=474ff6b8a79093aea966b6246d5b8000de124da9;p=linux.git

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
---

474ff6b8a79093aea966b6246d5b8000de124da9