From: Dave Airlie <airlied@redhat.com>
Date: Tue, 23 Feb 2010 05:42:18 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus
X-Git-Tag: v2.6.33~7^2~1
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=f7072e00f0868ff5184d29706905c4a9eca3608e

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

* 'nouveau/for-airlied' of ../drm-nouveau-next:
  drm/nv50: fix vram ptes on IGPs to point at stolen system memory
  drm/nv50: fix instmem binding on IGPs to point at stolen system memory
  drm/nv50: improve vram page table construction
  drm/nv50: more efficient clearing of gpu page table entries
  drm/nv50: make nv50_mem_vm_{bind,unbind} operate only on vram
  drm/nouveau: Fix up pre-nv17 analog load detection.
---

f7072e00f0868ff5184d29706905c4a9eca3608e