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