From: Keith Packard <keithp@keithp.com>
Date: Thu, 30 Jun 2011 03:38:41 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v3.1-rc1~230^2~18^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bee4d4acf563f91a7796cca53111d91be2532935;p=pandora-kernel.git

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

bee4d4acf563f91a7796cca53111d91be2532935
Reading git-diff-tree failed