Merge tag 'drm-intel-fixes-2014-08-28' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Fri, 29 Aug 2014 02:26:28 +0000 (12:26 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 29 Aug 2014 02:26:28 +0000 (12:26 +1000)
commit46712cc9596746d4da2bf6a90502b76823a3bc6c
tree6cddc427c45529ee6929f4f73d98ed0453a5938d
parent59753a805499f1ffbca4ac0a24b3dff67bf00001
parentbbe1c2740d3a25aa1dbe5d842d2ff09cddcdde0a
Merge tag 'drm-intel-fixes-2014-08-28' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Some more fixes for 3.17, mostly stable material.

* tag 'drm-intel-fixes-2014-08-28' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Remove bogus __init annotation from DMI callbacks
  drm/i915: don't warn if backlight unexpectedly enabled
  drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to haswell_crtc_disable()
  drm/i915: fix plane/cursor handling when runtime suspended
  drm/i915: Ignore VBT backlight presence check on Acer C720 (4005U)