From: Dave Airlie <airlied@redhat.com>
Date: Wed, 16 Dec 2009 05:52:21 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' of /ssd/git/drm-nouveau-next into drm-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ece84e04e99ff015fbf5071545ff2e643c9aea7f;p=linux-beck.git

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
---

ece84e04e99ff015fbf5071545ff2e643c9aea7f