Merge tag 'fbdev-v4.21' of git://github.com/bzolnier/linux