Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 3 Dec 2014 09:35:05 +0000 (19:35 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Dec 2014 09:35:05 +0000 (19:35 +1000)
commitd5b75dc01fa9c699aee5f82f5dbe508da438ff94
treea9eca99789d07574a82f03647e73d3e64c7e1ef3
parent4fcd01d0f34645710ac92d5523e26019428b0806
parentb8ccd1e490de8d9b9a968f859c003a10882ad8c8
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next

some vmware fixes.

* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: (Re)bind shaders to MOBs with the correct offset
  drm/vmwgfx: Fix fence event code
  drm/vmwgfx: Don't use memory accounting for kernel-side fence objects
  drm/vmwgfx: Fix error printout on signals pending