From: Dave Airlie <airlied@redhat.com>
Date: Wed, 23 Dec 2009 00:28:24 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' into drm-linus
X-Git-Tag: v2.6.33-rc2~19^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44f9e6c6bc508b202755d9e9e48a8ba96a5f0fa4;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge remote branch 'nouveau/for-airlied' into drm-linus

* nouveau/for-airlied:
  drm/nouveau: fix bug causing pinned buffers to lose their NO_EVICT flag
  drm/nv50: fix suspend/resume delays without firmware present
  drm/nouveau: prevent all channel creation if accel not available
  drm/nv50: fix two potential suspend/resume oopses
  drm/nv40: implement ctxprog/state generation
  drm/nv10: Add the initial graph context and soft methods needed for LMA.
  drm/nouveau: Fix up buffer eviction, and evict them to GART, if possible.
  drm/nouveau: Add proper error handling to nouveau_card_init
  drm/nv04: Fix NV04 set_operation software method.
  drm/nouveau: Kill global state in BIOS script interpreter
  drm/nouveau: Kill global state in NvShadowBIOS
  drm/nouveau: use drm debug levels
  drm/i2c/ch7006: Fix load detection false positives right after system init.
  drm/nv04-nv40: Fix "conflicting memory types" when saving/restoring VGA fonts.
---

44f9e6c6bc508b202755d9e9e48a8ba96a5f0fa4