Merge branch 'fbdev-for-linus' into fbdev-next