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)
commit4b7ba8697bc519abd4f79057f65a8a8e7107ac37
treee959028bf89da63e6928259aebe4dae6b2c13a29
parentcd3de83f147601356395b57a8673e9c5ff1e59d1
parent18e4a4669c5023eb1157f2a3f1bf6ca2b8535572
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