Skip to content
Commit 1d2bb68d authored by Eric Anholt's avatar Eric Anholt
Browse files

Merge commit 'origin/master' into drm-gem 

Conflicts:

	linux-core/Makefile.kernel
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c
parents 487c42bd 514c05ce
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