Skip to content
Commit 92907cbb authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'v4.4-rc2' into drm-intel-next-queued



Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a04
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 15fbfccf 1ec21837
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