From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Aug 2009 03:38:04 +0000 (+1000)
Subject: Merge Linus master to drm-next
X-Git-Tag: v2.6.32-rc1~52^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51c8b4071d84d46cc100baa5931ad06b2a823c95;p=pandora-kernel.git

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
---

51c8b4071d84d46cc100baa5931ad06b2a823c95
Reading git-diff-tree failed