tree 83e7a0a2d1865ad413ac76a7a0883d4ed3d52dc8
parent 9f3a6284880ceea452903e2043c88d7226736318
parent 4e4ddd47774313accc86b233d6ca2c6a9037a671
author Linus Torvalds <torvalds@linux-foundation.org> 1266977614 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266977614 -0800

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/vmwgfx: Fix queries if no dma buffer thrashing is occuring.
  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.