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)
commitd8af20bcae25e8792ccd8c94404e6e57e7db75f2
treeb58cc8e2865ed7a25a9922344da5e7130d7baada
parent917db410450e265b82ac36ad1cbbfd5f3ca9a204
parentcbd75e97a525e3819c02dc18bc2d67aa544c9e45
Merge branch 'vmwgfx-fixes-3.15' of git://people.freedesktop.org/~thomash/linux into drm-next

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