Merge tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 27 Aug 2015 03:01:23 +0000 (13:01 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 27 Aug 2015 03:01:23 +0000 (13:01 +1000)
commit31607793ee81da3f1024df9560f0dec49abde37f
tree889573a0db31cb34fb5f322328aac8fa4158e34d
parent40b2dffbcc67e92d5df97785dffc68fe88605bfa
parent36d4e87b497d9cb3bf8e1bb2f803c7aa41dfb463
Merge tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 15-08-21

The third pull request for 4.3. Contains two fixes for regressions introduced
with previous pull requests.

* tag 'vmwgfx-next-15-08-21' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Remove duplicate ttm_bo_device_release
  drm/vmwgfx: Fix a circular locking dependency in the fbdev code