• Daniel Vetter's avatar
    Merge tag 'v4.4-rc2' into drm-intel-next-queued · 92907cbb
    Daniel Vetter authored
    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>
    92907cbb
intel_ringbuffer.c 84.3 KB