Skip to content
Commit f0fe478c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'master' into modesetting-101 

Conflicts:

	shared-core/i915_dma.c
	tests/ttmtest/src/ttmtest.c
parents e1bc147a 62cdc6db
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