Merge branch 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 04:02:32 +0000 (14:02 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Feb 2013 04:02:32 +0000 (14:02 +1000)
TTM reservations changes, preparing for new reservation mutex system.

* 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux:
  drm/ttm: unexport ttm_bo_wait_unreserved
  drm/nouveau: use ttm_bo_reserve_slowpath in validate_init, v2
  drm/ttm: use ttm_bo_reserve_slowpath_nolru in ttm_eu_reserve_buffers, v2
  drm/ttm: add ttm_bo_reserve_slowpath
  drm/ttm: cleanup ttm_eu_reserve_buffers handling
  drm/ttm: remove lru_lock around ttm_bo_reserve
  drm/nouveau: increase reservation sequence every retry
  drm/vmwgfx: always use ttm_bo_is_reserved

1  2 
drivers/gpu/drm/nouveau/nouveau_gem.c
drivers/gpu/drm/ttm/ttm_bo.c

Simple merge
Simple merge