summaryrefslogtreecommitdiff
path: root/linux-core/sis_drv.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-03-12 10:18:33 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-03-12 10:18:33 +0000
commitb6dc381fabb199e70dc681e44e31452af8536313 (patch)
tree9b25b1a427cba3d3e35d4272e53a482038142242 /linux-core/sis_drv.c
parent7f04dd06e6003dd492ae5ddc876121a686f49157 (diff)
parent2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Conflicts: shared-core/i915_dma.c shared-core/i915_drv.h shared-core/i915_irq.c
Diffstat (limited to 'linux-core/sis_drv.c')
0 files changed, 0 insertions, 0 deletions