From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 04:15:09 +0000 (+1000)
Subject: Merge branch 'drm-ttm-unmappable' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb;p=pandora-kernel.git

Merge branch 'drm-ttm-unmappable' into drm-core-next

* drm-ttm-unmappable:
  drm/radeon/kms: enable use of unmappable VRAM V2
  drm/ttm: remove io_ field from TTM V6
  drm/vmwgfx: add support for new TTM fault callback V5
  drm/nouveau/kms: add support for new TTM fault callback V5
  drm/radeon/kms: add support for new fault callback V7
  drm/ttm: ttm_fault callback to allow driver to handle bo placement V6
  drm/ttm: split no_wait argument in 2 GPU or reserve wait

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_bo.c
---

7547a917fa5f3b2406f52c7dcf7ec9ad3c8532eb
Reading git-diff-tree failed