]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge