Merge tag 'fbdev-updates-for-3.5' of git://github.com/schandinat/linux-2.6