tree b58cc8e2865ed7a25a9922344da5e7130d7baada
parent 917db410450e265b82ac36ad1cbbfd5f3ca9a204
parent cbd75e97a525e3819c02dc18bc2d67aa544c9e45
author Dave Airlie <airlied@redhat.com> 1398815023 +1000
committer Dave Airlie <airlied@redhat.com> 1398815023 +1000

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