Merge commit 'ickle/for-anholt' into drm-intel-next
authorEric Anholt <eric@anholt.net>
Fri, 2 Oct 2009 19:07:42 +0000 (12:07 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 2 Oct 2009 19:07:42 +0000 (12:07 -0700)

Trivial merge