Files
kernel_arpi/drivers/gpu/drm/i915/intel_sprite.c
Dave Airlie 1d8ac08d49 Merge tag 'v4.0-rc7' into drm-next
Linux 4.0-rc7

Requested by Alex for fixes -next needs.

Conflicts:
	drivers/gpu/drm/i915/intel_sprite.c
2015-04-09 07:48:27 +10:00

37 KiB