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)
commitd5f2b4b411c5ca95d6f66a33d213ece387ac4fc5
treec6f723b2c02e7a6e7cbcd4e7fe8f64b6c5b9e002
parent198170ab97bbf2ca6362bb7100e9ed86d90aa51f
parenta294aa724a1e932fb6017383e08532bfcc914df0
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
shared-core/i915_dma.c