]> 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)
commit742326522e42f2715d8fb1991f3da75c60756963
tree5909a8be311a09d3bfb4f089c01e639d9321473d
parent21bdbc1db814cbf15a51cb677e56644741d41327
parent6bacf9c604ce182434613f858d61da5fc74ecd00
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