]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf69a31cfaec1dfbac5c7fd2e32ec8cffa214411a
tree5909a8be311a09d3bfb4f089c01e639d9321473d
parent4db6c6efa0d4826326871d331b00abf7f0af9e81
parent0166d2adb30c2bcbed6db446f7e3d7813fc1f36e
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