git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 46712cc f01ea0c)
Merge branch 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Wed, 3 Sep 2014 03:39:47 +0000 (13:39 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Sep 2014 03:39:47 +0000 (13:39 +1000)
commit0977f906791f0cea689bd2ccd5289e2258f015a5
tree5909a8be311a09d3bfb4f089c01e639d9321473dtree
parent46712cc9596746d4da2bf6a90502b76823a3bc6ccommit | diff
parentf01ea0c3d9db536c64d47922716d8b3b8f21d850commit | diff
Merge branch 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Two vmwgfx fixes, marked for stable as well

* 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix a potential infinite spin waiting for fifo idle
  drm/vmwgfx: Fix an incorrect OOM return value
Unnamed repository; edit this file 'description' to name the repository.