OSDN Git Service

Fix up conflicts for DRI2 (untested)
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 19 Feb 2008 15:17:24 +0000 (15:17 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 19 Feb 2008 15:17:24 +0000 (15:17 +0000)
commit8caf6e95712bfae8d1a42ffabafcbb9686766116
tree44a508f79c9da34c96fa30f6bc91ce5fe4746705
parentf24ed2ad6c66e50268fd175146a1661ae4bbd350
Fix up conflicts for DRI2 (untested)
linux-core/i915_fence.c
shared-core/i915_dma.c
shared-core/i915_init.c