[git pull] drm fixes for rc5