diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 13:31:28 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-05 13:31:28 +1100 |
commit | e97c383ec4276a5f26750de13a8e77a1b9971e3b (patch) | |
tree | b5c47efbc844462d3ca8c24edada86ae21f5438c /MAINTAINERS | |
parent | ac8241b00e35ed2fc82d5de6e665e65ff09687d6 (diff) | |
parent | 5dc3443eb0d9d3688a6e5a3b4ebb9000d81ff6ba (diff) |
Merge remote-tracking branch 'battery/master'
Conflicts:
drivers/power/ab8500_bmdata.c
include/linux/mfd/abx500/ab8500-bm.h
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d261903f40d0..20fb97986bde 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7857,6 +7857,22 @@ F: Documentation/backlight/lp855x-driver.txt F: drivers/video/backlight/lp855x_bl.c F: include/linux/platform_data/lp855x.h +TI LP8727 CHARGER DRIVER +M: Milo Kim <milo.kim@ti.com> +S: Maintained +F: drivers/power/lp8727_charger.c +F: include/linux/platform_data/lp8727.h + +TI LP8788 MFD DRIVER +M: Milo Kim <milo.kim@ti.com> +S: Maintained +F: drivers/iio/adc/lp8788_adc.c +F: drivers/leds/leds-lp8788.c +F: drivers/mfd/lp8788*.c +F: drivers/power/lp8788-charger.c +F: drivers/regulator/lp8788-*.c +F: include/linux/mfd/lp8788*.h + TI TWL4030 SERIES SOC CODEC DRIVER M: Peter Ujfalusi <peter.ujfalusi@ti.com> L: alsa-devel@alsa-project.org (moderated for non-subscribers) |