Dave Airlie 51c8b4071d Merge Linus master to drm-next ...

linux-next conflict reported needed resolution.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/i915/intel_sdvo.c
	drivers/gpu/drm/radeon/radeon_ttm.c
	drivers/gpu/drm/ttm/ttm_bo.c

2009-08-20 13:38:04 +10:00

..

Makefile

drm: Add the TTM GPU memory manager subsystem.

2009-06-15 09:37:57 +10:00

ttm_agp_backend.c

agp: switch AGP to use page array instead of unsigned long array

2009-06-19 10:21:42 +10:00

ttm_bo_util.c

Merge Linus master to drm-next

2009-08-20 13:38:04 +10:00

ttm_bo_vm.c

Merge branch 'drm-radeon-kms' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2009-07-29 12:31:59 -07:00

ttm_bo.c

Merge Linus master to drm-next

2009-08-20 13:38:04 +10:00

ttm_global.c

drm/ttm: Memory accounting rework.

2009-08-19 16:09:53 +10:00

ttm_memory.c

drm/ttm: Memory accounting rework.

2009-08-19 16:09:53 +10:00

ttm_module.c

drm/ttm: Add a virtual ttm sysfs device.

2009-08-19 16:09:04 +10:00

ttm_tt.c

Merge Linus master to drm-next

2009-08-20 13:38:04 +10:00