tree 394f68003ea0bc2a0c24e510a7c5b13f479ce743
parent 2126d0a4a205e2d6b763434f892524cd60f74228
parent 6a2a11dbea5db417d200d38dda53c30a2e5603e0
author Dave Airlie <airlied@redhat.com> 1287445714 +1000
committer Dave Airlie <airlied@redhat.com> 1287445714 +1000

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