]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge tag 'vmwgfx-next-160520' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 20 May 2016 20:41:59 +0000 (06:41 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 20 May 2016 20:41:59 +0000 (06:41 +1000)
Pull request of 2016-05-20

* tag 'vmwgfx-next-160520' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Report vmwgfx version to vmware.log
  drm/vmwgfx: Add VMWare host messaging capability
  drm/vmwgfx: Kill some lockdep warnings


Trivial merge