commit | ff68146acb98b689947692bffd38ec4ad67eb1cb | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Mon May 09 09:14:38 2011 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Mon May 09 09:14:38 2011 +1000 |
tree | 76e5b8e196f595f14c5b4b6fd412b2cbd03a0d5e | |
parent | 58e73811c85d0c0e74b8d300547bbc9abaf40a38 [diff] | |
parent | 7a7b94ad8ce3e24d4dd97b45583911e0f03aecd6 [diff] |
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