Dave Airlie 1fbe6f625f Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next ...

Merge in the upstream tree to bring in the mainline fixes.

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_fbdev.c
	drivers/gpu/drm/nouveau/nouveau_sgdma.c

2011-12-20 14:43:53 +00:00

..

Makefile

drm/ttm: provide dma aware ttm page pool code V9

2011-12-06 10:39:33 +00:00

ttm_agp_backend.c

drm/ttm: merge ttm_backend and ttm_tt V5

2011-12-06 10:39:17 +00: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: simplify memory accounting for ttm user v2

2011-12-06 10:40:11 +00:00

ttm_bo_vm.c

drm/ttm: introduce callback for ttm_tt populate & unpopulate V4

2011-12-06 10:39:24 +00:00

ttm_bo.c

Merge tag 'v3.2-rc6' of /home/airlied/devel/kernel/linux-2.6 into drm-core-next

2011-12-20 14:43:53 +00:00

ttm_execbuf_util.c

Revert "drm/ttm: add a way to bo_wait for either the last read or last write"

2011-10-27 18:28:37 +02:00

ttm_lock.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

ttm_memory.c

drm/ttm: provide dma aware ttm page pool code V9

2011-12-06 10:39:33 +00: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_dma.c

drm/ttm: isolate dma data from ttm_tt V4

2011-12-06 10:40:02 +00:00

ttm_page_alloc.c

drm/ttm: isolate dma data from ttm_tt V4

2011-12-06 10:40:02 +00:00

ttm_tt.c

drm/ttm: isolate dma data from ttm_tt V4

2011-12-06 10:40:02 +00:00