Merge branch 'master' into pre-superioctl-branch
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Tue, 25 Sep 2007 16:03:31 +0000 (18:03 +0200)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Tue, 25 Sep 2007 16:03:31 +0000 (18:03 +0200)
commitc4b3a0f602abd02038f7e5dd45fcfb2df4b5fcfa
tree803662fb4d1eadb850d9ed2a622fe55d1ec97574
parent0774090d5b7d3eba734086b437021039bc19c365
parent03c47f1420bf17a1e0f2b86be500656ae5a4c95b
Merge branch 'master' into pre-superioctl-branch

Conflicts:

linux-core/drm_bo.c
linux-core/drm_fence.c
linux-core/drm_objects.h
shared-core/drm.h
linux-core/drm_bo.c
linux-core/drm_fence.c
linux-core/drm_objects.h
linux-core/i915_fence.c
linux-core/via_fence.c
linux-core/xgi_fence.c
shared-core/drm.h