Merge tag 'v3.16' into drm-next

Linux 3.16

backmerge requested by i915, nouveau and radeon authors

Conflicts:
	drivers/gpu/drm/i915/i915_gem_render_state.c
	drivers/gpu/drm/i915/intel_drv.h

diff --cc arch/arm/boot/dts/exynos4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/exynos5420.dtsi
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/intel_drv.h
index b2837c5fccfcef012f92a073d2728b23378a172b,f67340ed2c12e57e5704c433cc70b5a495d4e08c..8a475a6909c30e7fc3ce68fa239162e8509a3be0
--- 1/drivers/gpu/drm/i915/intel_drv.h
--- 2/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -556,17 -537,12 +556,20 @@@ struct intel_dp 
        unsigned long last_power_cycle;
        unsigned long last_power_on;
        unsigned long last_backlight_off;
 -      bool psr_setup_done;
++
+       struct notifier_block edp_notifier;
+ 
        bool use_tps3;
 +      bool can_mst; /* this port supports mst */
 +      bool is_mst;
 +      int active_mst_links;
 +      /* connector directly attached - won't be use for modeset in mst world */
        struct intel_connector *attached_connector;
  
 +      /* mst connector list */
 +      struct intel_dp_mst_encoder *mst_encoders[I915_MAX_PIPES];
 +      struct drm_dp_mst_topology_mgr mst_mgr;
 +
        uint32_t (*get_aux_clock_divider)(struct intel_dp *dp, int index);
        /*
         * This function returns the value we have to program the AUX_CTL

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
Simple merge