Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modeset...
authorJesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Tue, 13 May 2008 21:47:17 +0000 (14:47 -0700)
committerJesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Tue, 13 May 2008 21:47:17 +0000 (14:47 -0700)
1  2 
shared-core/i915_dma.c
shared-core/i915_init.c

Simple merge
Simple merge