From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Jul 2014 01:04:06 +0000 (+1000)
Subject: Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux... 
X-Git-Tag: v6.6-pxa1908~22828^2~89
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=4b7ba8697bc519abd4f79057f65a8a8e7107ac37;p=linux.git

Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2014-07-04

* tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix compat shader namespace
---

4b7ba8697bc519abd4f79057f65a8a8e7107ac37