Dave Airlie a8c6ecb3be Merge tag 'v4.0-rc3' into drm-next ...

Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box

Conflicts:
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/intel_display.c

2015-03-09 19:58:30 +10:00

7.0 KiB

Raw Blame History

View Raw