From: Dave Airlie Date: Fri, 3 Sep 2010 03:31:33 +0000 (+1000) Subject: Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-fixes X-Git-Tag: v2.6.36-rc4~95^2~4 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4645b94e5c1aa9c65ee90852ec9538010b114e6a;p=linux.git 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. --- 4645b94e5c1aa9c65ee90852ec9538010b114e6a