tree 0fca541c4ea3a1c871c301343526452d404a76ac
parent 5e2368a3bbb36d24c038d87d61ebf291e4be5197
parent 94669e6ba1ada133394ec8295d773df8b9238d08
author Dave Airlie <airlied@redhat.com> 1458166291 +1000
committer Dave Airlie <airlied@redhat.com> 1458166291 +1000

Merge tag 'drm-intel-next-fixes-2016-03-16' of http://anongit.freedesktop.org/git/drm-intel into drm-next

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