tree 098cf9d41ce1c548d922708a770a9efe35e434df
parent a987fcaa805fcb24ba885c2e29fd4fdb6816f08f
parent 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f
author Dave Airlie <airlied@redhat.com> 1250739484 +1000
committer Dave Airlie <airlied@redhat.com> 1250739484 +1000

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