Merge branch 'drm-next' of ../drm-2.6 into drm-next