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)
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo


Trivial merge