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