Merge remote-tracking branch 'drm/drm-next'

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
Simple merge

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

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

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

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

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge

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

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

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge