Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into...

Daniel prepared this branch with a back-merge as git was getting
very confused about changes in intel_display.c

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
Simple merge

diff --cc drivers/gpu/drm/radeon/si.c
Simple merge