Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linus