tree 17031e0393468b84de208b779033013769131765
parent 47ef4ad2684d380dd6d596140fb79395115c3950
parent ed2eebbd61af8d378ca39ad7aef7017f29eed6f3
author Dave Airlie <airlied@redhat.com> 1468908560 +1000
committer Dave Airlie <airlied@redhat.com> 1468908560 +1000

Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Two more regression fixes for 4.7.

* tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: add missing condition for committing planes on crtc
  drm/i915: Treat eDP as always connected, again