tree a9abb31152e549d9225cb245679b45f0a2a1e95a
parent 635f1a31292087a2e99568bf4451c10ee287adaa
parent 6c42966768b0254f465a8f451333795283f53d22
author Dave Airlie <airlied@redhat.com> 1266903738 +1000
committer Dave Airlie <airlied@redhat.com> 1266903738 +1000

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.