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

Merge branch 'origin' into modesetting-101 

Conflicts:

	linux-core/drm_bo.c

Merge in changes from master from Thomas fixiing TTM problems
parents c71c44bb 5a96d59c
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