Merge branch 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 12 Mar 2015 23:15:56 +0000 (09:15 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 Mar 2015 23:15:56 +0000 (09:15 +1000)
commit552d6643412980044dfb9b38fcfe0179dbd77b28
tree79dda8f73fc57a4b2cc88dce84e242a694192525
parent17b263f6ea4692b031775df1028e367cfcaad950
parentfd3e4d6e26288d12b566912f692e278e8db15b82
Merge branch 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linux into drm-fixes

A couple of fixes for vmwgfx.

* 'vmwgfx-fixes-4.0' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
  drm/vmwgfx: Correctly NULLify dma buffer pointer on failure
  drm/vmwgfx: Reorder device takedown somewhat
  drm/vmwgfx: Fix a couple of lock dependency violations