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

Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101 

Conflicts:

	linux-core/drm_drv.c
	shared-core/drm.h
	shared-core/i915_dma.c
parents f99dea7d cfa21b22
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