drm: merge in Linus mainline