Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2013 23:51:43 +0000 (09:51 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 13 Nov 2013 23:51:43 +0000 (09:51 +1000)
commitca9efa17413320694760f70805f0bee7d70224df
treed5db74b8ec850045401836fdf08f09611960dd53
parentcf0613d242805797f252535fcf7bb019512beb46
parente14cd9536bd11b174a849da91c7a26bbc980330d
Merge branch 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next

A resource eviction fix, and a fix for compilation / sparse problems
from the previous pull.

* 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a couple of compile / sparse warnings and errors
  drm/vmwgfx: Resource evict fixes
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c