Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux