From: Dave Airlie Date: Fri, 8 Feb 2013 04:02:32 +0000 (+1000) Subject: Merge branch 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux into... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b9e5071386007729110e86fd2c55c687085624e3;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-airlied' of git://people.freedesktop.org/~mlankhorst/linux into drm-next 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 --- b9e5071386007729110e86fd2c55c687085624e3