Commit 8229c885 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: Merge tag 'v3.3-rc7' into drm-core-next 

Merge the fixes so far into core-next, needed to test
intel driver.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
parents c3c50e8b fde7d904
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

CRA Git | Maintained and supported by SUSTech CRA and CCSE