| commit | c09cd6e9691ec6fce8cb90b65929cad389d39c84 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Nov 15 10:02:39 2013 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Fri Nov 15 10:02:39 2013 +0100 |
| tree | d76104420f72172b21b8fb5ca512baa016ac892b | |
| parent | 7eb1c496f7ac0f386552c0cd9144f6965fc61da5 [diff] | |
| parent | 96ab4c70396e4e5a4d623bc95e86484682bef78f [diff] |
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>