Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 23 Oct 2007 14:34:12 +0000 (15:34 +0100)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 23 Oct 2007 14:34:12 +0000 (15:34 +0100)
1  2 
shared-core/i915_dma.c

Simple merge