From: Keith Packard <keithp@keithp.com>
Date: Mon, 25 Jul 2011 21:57:41 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v3.1-rc1~22^2~10^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=887a82ee80b42bb14ba70f8138292023d5040b08;p=thirdparty%2Fkernel%2Flinux.git

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

887a82ee80b42bb14ba70f8138292023d5040b08