Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 26 Feb 2008 15:42:41 +0000 (15:42 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 26 Feb 2008 15:42:41 +0000 (15:42 +0000)
commit1e66322633943bc27bf5e68609f564fa95e6e6a1
tree1a536a41c6d9818484c0a972d565fb4914943729
parent73cb02b5430b3881cbce5fb4852ac573c11ff831
parente87cec19687089f9f268ec0eb81b57e6fb8de6a9
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101

Conflicts:

shared-core/i915_dma.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/radeon_state.c