Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next
authorDave Airlie <airlied@redhat.com>
Mon, 18 Oct 2010 23:48:34 +0000 (09:48 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 18 Oct 2010 23:48:34 +0000 (09:48 +1000)
commitb7ae5056c94a8191c1fd0b5697707377516c0c5d
tree394f68003ea0bc2a0c24e510a7c5b13f479ce743
parent2126d0a4a205e2d6b763434f892524cd60f74228
parent6a2a11dbea5db417d200d38dda53c30a2e5603e0
Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next

Conflicts:
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/ttm/ttm_bo.c
19 files changed:
MAINTAINERS
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_fb.c
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/nouveau/nouveau_notifier.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/r600_blit_kms.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_atombios.c
drivers/gpu/drm/radeon/radeon_cursor.c
drivers/gpu/drm/radeon/radeon_fb.c
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/radeon/rs600.c
drivers/gpu/drm/radeon/rs690.c
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/ttm/ttm_bo.c
include/drm/ttm/ttm_bo_api.h