Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
authorDave Airlie <airlied@redhat.com>
Tue, 7 Dec 2010 23:30:59 +0000 (09:30 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 7 Dec 2010 23:30:59 +0000 (09:30 +1000)

Trivial merge