Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux...

Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux

 into linux-fbdev/for-3.10-fixes

Pull Tomi fixes for ps3fb and omap2

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>