Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...
authorDave Airlie <airlied@redhat.com>
Sat, 16 Jun 2012 13:45:17 +0000 (14:45 +0100)
committerDave Airlie <airlied@redhat.com>
Sat, 16 Jun 2012 13:45:17 +0000 (14:45 +0100)
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: cache the EDID for eDP panels
  Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
  drm/i915: eDP aux needs vdd
  drm/i915: don't enumerate HDMID if an eDP panel is already active on the port


Trivial merge