From: Tomi Valkeinen 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=474ff6b8a79093aea966b6246d5b8000de124da9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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