From: Keith Packard <keithp@keithp.com>
Date: Thu, 7 Jul 2011 22:39:51 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v3.1-rc1~230^2~18^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe5a7e3cac5b60774186a95bbb7555fa604080c;p=thirdparty%2Fkernel%2Flinux.git

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

6fe5a7e3cac5b60774186a95bbb7555fa604080c