Merge tag 'drm-intel-fixes-2016-07-18' of git://anongit.freedesktop.org/drm-intel...
authorDave Airlie <airlied@redhat.com>
Tue, 19 Jul 2016 06:09:20 +0000 (16:09 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 19 Jul 2016 06:09:20 +0000 (16:09 +1000)
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


Trivial merge