Merge tag 'fbdev-for-3.10' of git://gitorious.org/linux-omap-dss2/linux