Merge remote branch 'airlied/drm-next' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Thu, 5 Nov 2009 23:04:06 +0000 (15:04 -0800)
committerEric Anholt <eric@anholt.net>
Thu, 5 Nov 2009 23:04:06 +0000 (15:04 -0800)

Trivial merge