Skip to content
Commit 2f03ba4a authored by Jesse Barnes's avatar Jesse Barnes
Browse files

Merge branch 'master' into modesetting-gem 

Conflicts:

	libdrm/Makefile.am
	libdrm/xf86drm.h
	shared-core/i915_dma.c
	shared-core/i915_irq.c
parents 085df649 b0e68829
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