From: Dave Airlie Date: Wed, 3 Sep 2014 03:39:47 +0000 (+1000) Subject: Merge branch 'vmwgfx-fixes-3.17' of git://people.freedesktop.org/~thomash/linux into... X-Git-Tag: v3.17-rc4~20^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0977f906791f0cea689bd2ccd5289e2258f015a5;p=linux.git 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 --- 0977f906791f0cea689bd2ccd5289e2258f015a5