Merge commit 'origin/modesetting-101' into modesetting-radeon
authorJerome Glisse <glisse@freedesktop.org>
Thu, 6 Dec 2007 21:42:17 +0000 (22:42 +0100)
committerJerome Glisse <glisse@freedesktop.org>
Thu, 6 Dec 2007 21:42:17 +0000 (22:42 +0100)

Trivial merge