From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 15 Nov 2013 09:02:39 +0000 (+0100)
Subject: Merge branch 'backlight-rework' into drm-intel-next-queued
X-Git-Tag: v3.14-rc1~47^2~90^2~46
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c09cd6e9691ec6fce8cb90b65929cad389d39c84;p=pandora-kernel.git

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: Daniel Vetter <daniel.vetter@ffwll.ch>
---

c09cd6e9691ec6fce8cb90b65929cad389d39c84
Reading git-diff-tree failed