Merge branch 'drm-gem' into drm-gem-965
authorKeith Packard <keithp@keithp.com>
Tue, 24 Jun 2008 17:03:05 +0000 (10:03 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 24 Jun 2008 17:03:05 +0000 (10:03 -0700)

Trivial merge