Merge tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git...
authorDave Airlie <airlied@redhat.com>
Wed, 16 Mar 2016 22:11:31 +0000 (08:11 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Mar 2016 22:11:31 +0000 (08:11 +1000)
* tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Handle -EDEADLK in drm_atomic_commit from load-detect.


Trivial merge