diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 08:21:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 08:21:32 -0800 |
commit | a57eaa1f25bb3e1d0aaf8906460053b9509c74a8 (patch) | |
tree | 69c3fc0bafaf9569cc8550780f8e2f687ceb93e4 /MAINTAINERS | |
parent | df9cdc1727ed9debfce59c5f600d794a63fcbfeb (diff) | |
parent | 80e5d455339ad15d0a5995c8b72d267ce1f70841 (diff) | |
download | linux-a57eaa1f25bb3e1d0aaf8906460053b9509c74a8.tar.bz2 |
Merge tag 'backlight-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight
Pull backlight updates from Lee Jones:
"Core Frameworks:
- Add Daniel Thompson as co-maintainer
Fix-ups:
- Improve error handling; adp5520_bl
- Split initial power checks into dedicated function; pwm_bl
- Check current PWM status; pwm_bl
Bug Fixes:
- Fix potential race; lcd
- Fix module auto-loading; da9052"
* tag 'backlight-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
MAINTAINERS: Rework entry for Backlight
backlight: da9052: Fix module autoload
backlight: pwm_bl: Check the PWM state for initial backlight power state
backlight: pwm_bl: Move the checks for initial power state to a separate function
backlight: adp5520: Fix error handling in adp5520_bl_probe()
backlight: lcd: Fix race condition during register
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7515e66945af..83a74a87ddf0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2380,12 +2380,15 @@ S: Maintained F: drivers/net/wireless/broadcom/b43legacy/ BACKLIGHT CLASS/SUBSYSTEM -M: Jingoo Han <jingoohan1@gmail.com> M: Lee Jones <lee.jones@linaro.org> +M: Daniel Thompson <daniel.thompson@linaro.org> +M: Jingoo Han <jingoohan1@gmail.com> T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git S: Maintained F: drivers/video/backlight/ F: include/linux/backlight.h +F: include/linux/pwm_backlight.h +F: Documentation/devicetree/bindings/leds/backlight BATMAN ADVANCED M: Marek Lindner <mareklindner@neomailbox.ch> |