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)

Trivial merge