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

Merge remote branch 'origin/master' into modesetting-101 

Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_drv.h
parents 7f269bec b44f2da3
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