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

Merge branch 'backlight-rework' into drm-intel-next-queued



Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.

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

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 7eb1c496 96ab4c70
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