+56
−31
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Jesse's SOix work required some patches from acpi-next, so pull it in
through a topic barnch.
Conflicts:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>