tree 59b0d0e9b6c251c4df5799b93395454592004d57
parent a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71
parent 6b8b1786a8c29ce6e32298b93ac8d4a18a2b11c4
author Dave Airlie <airlied@redhat.com> 1271736909 +1000
committer Dave Airlie <airlied@redhat.com> 1271736909 +1000

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