From: Dave Airlie Date: Sun, 8 May 2011 23:14:38 +0000 (+1000) Subject: Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into... X-Git-Tag: Ubuntu-5.0.0-8.9~19115^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ff68146acb98b689947692bffd38ec4ad67eb1cb;p=mirror_ubuntu-disco-kernel.git Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next: drm/nouveau: Fix a crash at card takedown for NV40 and older cards --- ff68146acb98b689947692bffd38ec4ad67eb1cb