From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 14 Dec 2010 11:34:51 +0000 (+0000)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v2.6.38-rc1~419^2~23^2~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9097eef024db4f1850015e837a84aca0aa40a288;p=linux.git

Merge branch 'drm-intel-fixes' into drm-intel-next
---

9097eef024db4f1850015e837a84aca0aa40a288