Skip to content
Commit 9adf8c02 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

Merge branch 'master' into modesetting-101 

Conflicts:

	linux-core/Makefile.kernel
	linux-core/drm_bo.c
	linux-core/drm_objects.h
parents d5f2b4b4 b9d9c304
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