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)
* '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


Trivial merge