| commit | ece84e04e99ff015fbf5071545ff2e643c9aea7f | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Dec 16 15:52:21 2009 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Dec 16 15:52:21 2009 +1000 |
| tree | 8d02a6e6d78238e8ef140e5585df51a1fd840966 | |
| parent | dafc3bd515d6079406986f7748b48adb3c7170f2 [diff] | |
| parent | 9ddc8c52f58338ddc278fc82e540d9eaf4489dc7 [diff] |
Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-linus * 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next: drm/nouveau: remove use of -ERESTART nouveau: Fix endianness with new context program loader drm/nouveau: fix build with CONFIG_AGP=n drm/nouveau: fix ch7006 build