Merge branch 'drm-intel-next-fixes' into drm-intel-fixes
authorKeith Packard <keithp@keithp.com>
Thu, 12 Jan 2012 20:51:06 +0000 (12:51 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 12 Jan 2012 20:51:06 +0000 (12:51 -0800)
commita190d703f0cd1de301b80c3219cf891c2779d15f
tree05410e7425fc113ec8847a5752dc56ecf8a146c3
parent1a464cbb3d483f2f195b614cffa4aa1b910a0440
parent44306ab302687b519a31aa498b954c1e26f95a6b
Merge branch 'drm-intel-next-fixes' into drm-intel-fixes