From: Dave Airlie <airlied@redhat.com>
Date: Tue, 8 Dec 2009 04:03:47 +0000 (+1000)
Subject: Merge remote branch 'anholt/drm-intel-next' into drm-linus
X-Git-Tag: v2.6.33-rc1~323^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ff99164f67aae78a2bd2313f65ad55bddb1ffea;p=pandora-kernel.git

Merge remote branch 'anholt/drm-intel-next' into drm-linus

This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.

Conflicts:
	drivers/char/agp/intel-agp.c
	drivers/gpu/drm/drm_dp_i2c_helper.c
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/i915_suspend.c
---

3ff99164f67aae78a2bd2313f65ad55bddb1ffea
Reading git-diff-tree failed