Merge branch 'fbdev-driver-fixes' of master.kernel.org:/pub/scm/linux/kernel/git...