Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next 

Conflicts:
	drivers/gpu/drm/i915/intel_fb.c
	drivers/gpu/drm/radeon/r600_blit_kms.c
	drivers/gpu/drm/ttm/ttm_bo.c
parents 2126d0a4 6a2a11db
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