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

Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into radeon-ttm 

Conflicts:

	linux-core/ati_pcigart.c
	linux-core/drmP.h
	linux-core/radeon_buffer.c
parent abf35cbd
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