Merge tag 'fbdev-v4.20' of https://github.com/bzolnier/linux