Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modeset...
authorJesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Tue, 8 Apr 2008 19:48:41 +0000 (12:48 -0700)
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Tue, 8 Apr 2008 19:48:41 +0000 (12:48 -0700)

Trivial merge