Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 3 Sep 2010 03:31:33 +0000 (13:31 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 3 Sep 2010 03:31:33 +0000 (13:31 +1000)
commit4645b94e5c1aa9c65ee90852ec9538010b114e6a
tree798852ab2a97e9b4d30b09840c891236946e2db9
parentea39302b87b8d944d567ef29c0647c09da5743fa
parent615661f3948a066fd22a36fe8ea0c528b75ee373
Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes

* 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next:
  drm/nv50: initialize ramht_refs list for faked 0 channel
  drm/nouveau: Don't take struct_mutex around the pushbuf IOCTL.
  drm/nouveau: Take fence spinlock before reading the last sequence.
drivers/gpu/drm/nouveau/nouveau_gem.c