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