]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Linux kernel for KaRo TX COM modules