| commit | ca9efa17413320694760f70805f0bee7d70224df | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Thu Nov 14 09:51:43 2013 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Thu Nov 14 09:51:43 2013 +1000 |
| tree | d5db74b8ec850045401836fdf08f09611960dd53 | |
| parent | cf0613d242805797f252535fcf7bb019512beb46 [diff] | |
| parent | e14cd9536bd11b174a849da91c7a26bbc980330d [diff] |
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