Skip to content
Commit 43891ff2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'origin/master' into modesetting-101 

Conflicts:

	linux-core/drm_compat.c
parents 81db4853 a6a2f2c8
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