Skip to content
Commit 5ce43a34 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

Merge branch 'master' into modesetting-101 

Conflicts:

	linux-core/drm_bufs.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
parents 1b911139 427cc561
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