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

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b2837c5fccfc..8a475a6909c3 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -556,6 +556,9 @@ struct intel_dp {
         unsigned long last_power_cycle;
         unsigned long last_power_on;
         unsigned long last_backlight_off;
+
+        struct notifier_block edp_notifier;
+
         bool use_tps3;
         bool can_mst; /* this port supports mst */
         bool is_mst;