Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-linus
authorDave Airlie <airlied@redhat.com>
Wed, 16 Dec 2009 05:52:21 +0000 (15:52 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Dec 2009 05:52:21 +0000 (15:52 +1000)
commitece84e04e99ff015fbf5071545ff2e643c9aea7f
tree8d02a6e6d78238e8ef140e5585df51a1fd840966
parentdafc3bd515d6079406986f7748b48adb3c7170f2
parent9ddc8c52f58338ddc278fc82e540d9eaf4489dc7
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