tree b03d40d2be5d6c71c50988c2b99f8145880cc2d8
parent 7c77bf2a1a8bf67d580a3b189b37fded0a13ab78
parent d6f24d0fa6cdf3431a2fe3330a74bc6c5871f496
author Dave Airlie <airlied@redhat.com> 1339854317 +0100
committer Dave Airlie <airlied@redhat.com> 1339854317 +0100

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

* '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