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

drm: merge Linux master into HEAD 

Conflicts:
	drivers/gpu/drm/drm_info.c
	drivers/gpu/drm/drm_proc.c
	drivers/gpu/drm/i915/i915_gem_debugfs.c
parents 41f13fe8 07d43ba9
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