Merge branch 'intel-post-reloc'
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 12 Mar 2008 10:34:29 +0000 (11:34 +0100)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Wed, 12 Mar 2008 10:34:29 +0000 (11:34 +0100)
commit88bd1e4a350d011ec44f6786e0bfdf8fb386800c
treee78d09fe0eb28514aa060de05ba8aee298fd120e
parent2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c
parent612c22f131a25915196e69d7ec1adb6f4ec84a60
Merge branch 'intel-post-reloc'

Conflicts:

linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/drm_ttm.c
shared-core/i915_dma.c

Bump driver minor to 13 due to introduction of new
relocation type.
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/i915_execbuf.c
shared-core/i915_dma.c
shared-core/i915_drv.h