Merge branch 'master' into vga-arbiter
authorDave Airlie <airlied@redhat.com>
Wed, 5 Aug 2009 23:42:06 +0000 (09:42 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 5 Aug 2009 23:42:06 +0000 (09:42 +1000)

Trivial merge