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