Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 13 Dec 2013 02:03:52 +0000 (12:03 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 13 Dec 2013 02:03:52 +0000 (12:03 +1000)
Part of a driver stack fix that fixes surface overcommiting on single execbuf calls.
* 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Add max surface memory param


Trivial merge