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)
commit0ca9fff744c8ae22401d1ef10a378588afd55abc
treef78f01333f7f0c9ce684bfc2b793c2ae6d0977bb
parent7fc61f845859fdca5a2c85a45eb39ce57cdd2276
parent11e6a09fba446ce799a9de51d2d99586024bbdaa
Merge branch 'vmwgfx-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-fixes

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