Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into...
authorDave Airlie <airlied@redhat.com>
Tue, 3 Jan 2012 09:34:43 +0000 (09:34 +0000)
committerDave Airlie <airlied@redhat.com>
Tue, 3 Jan 2012 09:34:43 +0000 (09:34 +0000)
commit2318fcd65c1fb1e842f860c1e3fe4dba7e55cd11
tree8f2d73ee6f8be3f49ee07881a8579fa15f9e1881
parentf9f23a77f07506a32d9dc1d925bf85c0e7507b66
parent097354eb14fa94d31a09c64d640643f58e4a5a9a
Merge branch 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux into drm-core-next

* 'drm-intel-next' of git://people.freedesktop.org/~keithp/linux:
  drm/i915: check ACTHD of all rings
  drm/i915: DisplayPort hot remove notification to audio driver
  drm/i915: HDMI hot remove notification to audio driver
  drm/i915: dont trigger hotplug events on unchanged ELD
  drm/i915: rename audio ELD registers
  drm/i915: fix ELD writing for SandyBridge
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/i915_reg.h
drivers/gpu/drm/i915/intel_display.c