]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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.

1  2 
drivers/gpu/drm/nouveau/nouveau_gem.c

Simple merge