From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Sep 2009 10:27:20 +0000 (+1000)
Subject: Merge intel drm-intel-next branch
X-Git-Tag: v2.6.32-rc1~52^2~71
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11670d3c93210793562748d83502ecbef4034765;p=pandora-kernel.git

Merge intel drm-intel-next branch

Merge remote branch 'anholt/drm-intel-next' of ../anholt-2.6 into drm-next

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i915/intel_drv.h
	drivers/gpu/drm/i915/intel_sdvo.c
---

11670d3c93210793562748d83502ecbef4034765
Reading git-diff-tree failed