Merge branch 'server-fixes' into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 3 May 2013 00:13:08 +0000 (10:13 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 3 May 2013 00:13:08 +0000 (10:13 +1000)
commitd2dbaaf6265d292575bfe41bf668b0cab759e19c
tree255a26df4d499798d0af62d43773594ca2cd0ad7
parent7e17fc0b69fbec2c25398adfb18a18fa6b210a53
parentf3b2bbdc8a87a080ccd23d27fca4b87d61340dd4
Merge branch 'server-fixes' into drm-next

Merge the fixes for the server driver dirty update paths
* server-fixes:
  drm/cirrus: deal with bo reserve fail in dirty update path
  drm/ast: deal with bo reserve fail in dirty update path
  drm/mgag200: deal with bo reserve fail in dirty update path