linux-next: manual merge of the drm-intel tree with Linus' tree

Stephen Rothwell
2015-12-22T01:04:02Z

drivers/gpu/drm/i915/intel_pm.c

between commit:

344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0")

from Linus' tree and commit:

06e668ac91c9 ("drm/i915: Apply broader WaRsDisableCoarsePowerGating for guc also")

from the drm-intel tree.

I fixed it up (I just used the latter version) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au