]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into...
authorDave Airlie <airlied@redhat.com>
Sun, 8 May 2011 23:14:38 +0000 (09:14 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 8 May 2011 23:14:38 +0000 (09:14 +1000)
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
  drm/nouveau: Fix a crash at card takedown for NV40 and older cards


Trivial merge