From: Dave Airlie <airlied@redhat.com>
Date: Mon, 14 Mar 2011 23:59:31 +0000 (+1000)
Subject: Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core... 
X-Git-Tag: v3.0~1070^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=235b87afbcadf46e5ca042b2e7a977a41ebce9dd;p=platform%2Fkernel%2Flinux-amlogic.git

Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next

* 'nouveau/drm-nouveau-next' of ../drm-nouveau-next:
  drm/nouveau: fix __nouveau_fence_wait performance
  drm/nv40: attempt to reserve just enough vram for all 32 channels
  drm/nv50: check for vm traps on every gr irq
  drm/nv50: decode vm faults some more
  drm/nouveau: add nouveau_enum_find() util function
  drm/nouveau: properly handle pushbuffer check failures
  drm/nvc0: remove vm hack forcing large/small pages to not share a PDE
---

235b87afbcadf46e5ca042b2e7a977a41ebce9dd