From: Keith Packard <keithp@keithp.com>
Date: Thu, 12 Jan 2012 20:51:06 +0000 (-0800)
Subject: Merge branch 'drm-intel-next-fixes' into drm-intel-fixes
X-Git-Tag: v3.3-rc2~20^2~3^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a190d703f0cd1de301b80c3219cf891c2779d15f;p=users%2Fjedix%2Flinux-maple.git

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

a190d703f0cd1de301b80c3219cf891c2779d15f