tree 596eff2f23ed4a40ea83083b0ac1811a93c1f649
parent 1922756124ddd53846877416d92ba4a802bc658f
parent 7db26623257a16c901a4b77bfc5096ee05304932
author Dave Airlie <airlied@redhat.com> 1298871316 +1000
committer Dave Airlie <airlied@redhat.com> 1298871316 +1000

Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes

* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo