Skip to content
Commit c561cb46 authored by Ian Romanick's avatar Ian Romanick
Browse files

Merge branch 'master' of ssh+git://git.freedesktop.org/git/mesa/drm into xgi-0-0-2 

Conflicts:

	linux-core/drmP.h
	linux-core/drm_scatter.c
parents 2bafeb67 4175dd81
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