Merge remote branch 'origin/modesetting-101' into modesetting-gem

diff --cc linux-core/Makefile
Simple merge

diff --cc linux-core/Makefile.kernel
Simple merge

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

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

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

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

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

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

diff --cc linux-core/intel_display.c
index 40cbc49,29aae16..a761b61
--- 1/linux-core/intel_display.c
--- 2/linux-core/intel_display.c
+++ b/linux-core/intel_display.c
@@@ -510,9 -507,9 +510,9 @@@ static void intel_crtc_dpms(struct drm_
                intel_crtc_load_lut(crtc);
                
                /* Give the overlay scaler a chance to enable if it's on this pipe */
 -              //intel_crtc_dpms_video(crtc, TRUE); TODO
 +              //intel_crtc_dpms_video(crtc, true); TODO
        break;
-       case DPMSModeOff:
+       case DRM_MODE_DPMS_OFF:
                /* Give the overlay scaler a chance to disable if it's on this pipe */
                //intel_crtc_dpms_video(crtc, FALSE); TODO
                

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

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

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

diff --cc shared-core/drm.h
Simple merge