Merge tag 'vmwgfx-next-2014-07-04' of git://people.freedesktop.org/~thomash/linux...
authorDave Airlie <airlied@redhat.com>
Tue, 8 Jul 2014 01:04:06 +0000 (11:04 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 8 Jul 2014 01:04:06 +0000 (11:04 +1000)
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


Trivial merge