Dave Airlie 017ed8012e Merge tag 'v3.1-rc10' into drm-core-next ... There are a number of fixes in mainline required for code in -next, also there was a few conflicts I'd rather resolve myself. Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/radeon/evergreen.c drivers/gpu/drm/radeon/r600.c drivers/gpu/drm/radeon/radeon_asic.h		2011-10-18 10:54:30 +01:00
..
Makefile	drm/ttm: restructure to allow driver to plug in alternate memory manager	2010-10-05 10:01:20 +10:00
ttm_agp_backend.c	ttm: Expand (*populate) to support an array of DMA addresses.	2011-01-27 16:07:58 -05:00
ttm_bo_manager.c	drm/ttm: Use private locks for the default bo range manager	2010-11-09 13:33:24 +10:00
ttm_bo_util.c	drm/ttm: add a way to bo_wait for either the last read or last write	2011-08-31 19:25:35 +01:00
ttm_bo_vm.c	drm/ttm: add a way to bo_wait for either the last read or last write	2011-08-31 19:25:35 +01:00
ttm_bo.c	Merge tag 'v3.1-rc10' into drm-core-next	2011-10-18 10:54:30 +01:00
ttm_execbuf_util.c	drm/ttm: add a way to bo_wait for either the last read or last write	2011-08-31 19:25:35 +01:00
ttm_lock.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ttm_memory.c	Merge branch 'drm-ttm-pool' into drm-core-next	2010-04-20 13:12:28 +10:00
ttm_module.c	drm: move ttm global code to core drm	2010-08-04 09:46:06 +10:00
ttm_object.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ttm_page_alloc.c	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
ttm_tt.c	drm/ttm: use shmem_read_mapping_page	2011-06-27 18:00:13 -07:00