diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
| commit | 88bd1e4a350d011ec44f6786e0bfdf8fb386800c (patch) | |
| tree | e78d09fe0eb28514aa060de05ba8aee298fd120e /bsd-core/i915 | |
| parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) | |
| parent | 612c22f131a25915196e69d7ec1adb6f4ec84a60 (diff) | |
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.
Diffstat (limited to 'bsd-core/i915')
0 files changed, 0 insertions, 0 deletions