tree 8f2d73ee6f8be3f49ee07881a8579fa15f9e1881
parent f9f23a77f07506a32d9dc1d925bf85c0e7507b66
parent 097354eb14fa94d31a09c64d640643f58e4a5a9a
author Dave Airlie <airlied@redhat.com> 1325583283 +0000
committer Dave Airlie <airlied@redhat.com> 1325583283 +0000

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