Merge branch 'modesetting-airlied' into modesetting-101

diff --cc linux-core/drm_bo.c
Simple merge

diff --cc linux-core/drm_crtc.c
Simple merge

diff --cc linux-core/drm_crtc.h
Simple merge

diff --cc linux-core/intel_crt.c
Simple merge

diff --cc linux-core/intel_sdvo.c
Simple merge

diff --cc shared-core/i915_init.c
Simple merge