Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into...
authorDave Airlie <airlied@redhat.com>
Mon, 28 Feb 2011 05:35:16 +0000 (15:35 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 28 Feb 2011 05:35:16 +0000 (15:35 +1000)
commit467a29ea5ad1c1e3b1ffd6aab1166331fcd39361
tree596eff2f23ed4a40ea83083b0ac1811a93c1f649
parent1922756124ddd53846877416d92ba4a802bc658f
parent7db26623257a16c901a4b77bfc5096ee05304932
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