Merge branch 'vmwgfx-fixes-3.15' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Tue, 29 Apr 2014 23:43:43 +0000 (09:43 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 29 Apr 2014 23:43:43 +0000 (09:43 +1000)
single security fix, cc'd stable.

* 'vmwgfx-fixes-3.15' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Make sure user-space can't DMA across buffer object boundaries v2


Trivial merge