Merge tag 'omapdss-for-3.7-rc' of git://gitorious.org/linux-omap-dss2/linux