Merge remote branch 'airlied/drm-next' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Tue, 1 Dec 2009 17:01:54 +0000 (09:01 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 1 Dec 2009 17:01:54 +0000 (09:01 -0800)

Trivial merge