Skip to content
Commit 88bd1e4a authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

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.
parents 2a618e5a 612c22f1
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment