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