| commit | 51fda92223f5b668cccffd51bf3d7bedc93609ff | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Jan 17 12:20:31 2011 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Jan 17 12:20:31 2011 +1000 |
| tree | 326cb5d43889b55fad0b76cba9621a5c107b602f | |
| parent | e78bf5e6cbe837daa6ab628a5f679548742994d3 [diff] | |
| parent | f01a9720cb149e76155dc6e0e051058450305f4f [diff] |
Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: drm/nouveau: fix gpu page faults triggered by plymouthd drm/nouveau: greatly simplify mm, killing some bugs in the process drm/nvc0: enable protection of system-use-only structures in vm drm/nv40: initialise 0x17xx on all chipsets that have it drm/nv40: make detection of 0x4097-ful chipsets available everywhere