commit | 4645b94e5c1aa9c65ee90852ec9538010b114e6a | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Fri Sep 03 13:31:33 2010 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Fri Sep 03 13:31:33 2010 +1000 |
tree | 798852ab2a97e9b4d30b09840c891236946e2db9 | |
parent | ea39302b87b8d944d567ef29c0647c09da5743fa [diff] | |
parent | 615661f3948a066fd22a36fe8ea0c528b75ee373 [diff] |
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.