[git pull] drm-fixes