Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next