Skip to content
Commit 4b7ba869 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents cd3de83f 18e4a466
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment