Merge branch 'master' into drm-ttm-finalize
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 25 Oct 2007 07:24:45 +0000 (09:24 +0200)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 25 Oct 2007 07:24:45 +0000 (09:24 +0200)
commit07706c9b79b88baff5f160351b482ccdf3315f0c
tree0679ad42a802894aae3d535efdaf229d985b54bc
parent3d4b32e91647f61712d54a46f0a173deff46e6b4
parenta70fe82baf0ca2be98e02680cff489f90b0ea3de
Merge branch 'master' into drm-ttm-finalize
shared-core/i915_dma.c