diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 12:10:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 12:10:15 -0700 |
| commit | 76f901eb4659779ecacd0e4eba49f55442daef53 (patch) | |
| tree | 0761f03211ffdfc06216eabeb61b02ef6d598d3c /MAINTAINERS | |
| parent | bd0e162d0312aa95e8b85ba883efddebf27be121 (diff) | |
| parent | 96facd23e45e6d5020be135c8ab392ba9e044fa4 (diff) | |
| download | linux-76f901eb4659779ecacd0e4eba49f55442daef53.tar.gz linux-76f901eb4659779ecacd0e4eba49f55442daef53.tar.xz linux-76f901eb4659779ecacd0e4eba49f55442daef53.zip | |
Merge tag 'for-v3.5' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"A bunch of fixes for v3.5, nothing extraordinary."
* tag 'for-v3.5' of git://git.infradead.org/battery-2.6: (27 commits)
smb347-charger: Include missing <linux/err.h>
smb347-charger: Clean up battery attributes
max17042_battery: Add support for max17047/50 chip
sbs-battery.c: Capacity attr = remaining relative capacity
isp1704_charger: Use after free on probe error
ds2781_battery: Use DS2781_PARAM_EEPROM_SIZE and DS2781_USER_EEPROM_SIZE
power_supply: Fix a typo in BATTERY_DS2781 Kconfig entry
charger-manager: Provide cm_notify_event function for in-kernel use
charger-manager: Poll battery health in normal state
smb347-charger: Convert to regmap API
smb347-charger: Move IRQ enabling to the end of probe
smb347-charger: Rename few functions to match better what they are doing
smb347-charger: Convert to use module_i2c_driver()
smb347_charger: Cleanup power supply registration code in probe
ab8500: Clean up probe routines
ab8500_fg: Harden platform data check
ab8500_btemp: Harden platform data check
ab8500_charger: Harden platform data check
MAINTAINERS: Fix 'F' entry for the power supply class
max17042_battery: Handle irq request failure case
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8cad55b9db99..55f0fda602ec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5337,7 +5337,7 @@ M: David Woodhouse <dwmw2@infradead.org> T: git git://git.infradead.org/battery-2.6.git S: Maintained F: include/linux/power_supply.h -F: drivers/power/power_supply* +F: drivers/power/ PNP SUPPORT M: Adam Belay <abelay@mit.edu> |