Merge tag 'vmwgfx-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux...
authorDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:08:27 +0000 (16:08 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:08:27 +0000 (16:08 +1000)
commit14c6d5bdf759274868c6a3534e56f1991118df63
tree4a2a9843532a922a1eadc4d702414cc6f23cb366
parent8d51a977a4961d3ed6df699aea50bc2dd6bbc5cc
parentaa6de142c901cd2d90ef08db30ae87da214bedcc
Merge tag 'vmwgfx-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux into drm-next

Pull request of 2014-04-04

The second vmwgfx pull request for the 3.15 merge window.
Contains a fbdev fix by Christopher Friedt, one fix for a locking order
violation introduced in 3.14 (hit when using queries) and finally a
removal of the DRM_AUTH requirement around some vmwgfx IOCTLS where the
caller is already required to have an open handle to the object.

* tag 'vmwgfx-next-2014-04-04' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: correct fb_fix_screeninfo.line_length
  drm/vmwgfx: Remove authorization requirements around some more ioctls
  drm/vmwgfx: Fix query buffer locking order violation