| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 31 Jul 2011 16:24:50 +0000 (06:24 -1000) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 31 Jul 2011 16:24:50 +0000 (06:24 -1000) | ||
| commit | f0d15c96d4ddcf32b6f910c4c2487ee705e4d493 | |
| tree | 07c715e05527545e40cbc57d4377f95247c20ebe | tree | snapshot (tar.xz tar.gz zip) |
| parent | 4d8a93c7e542c364b1c2ad1dd406ede85080eab9 | commit | diff |
| parent | f8c63918c9a3004bd052fa4af08aa1cefbcd79ac | commit | diff |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6:
gpio-charger: Fix checking return value of request_any_context_irq
power_supply: MAX17042: Support additional properties
max8903_charger: Allow platform data to be __initdata
power_supply: Add charger driver for MAX8998/LP3974
power_supply: Add charger driver for MAX8997/8966
max17042_battery: Remove obsolete cleanup for clientdata
twl4030_charger: Fix warnings
wm831x_power: Support multiple instances
wm831x_backup: Support multiple instances
apm_power: Fix style error in macros
s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
bq20z75: Enable detection after registering
bq20z75: Add support for external notification
* git://git.infradead.org/battery-2.6:
gpio-charger: Fix checking return value of request_any_context_irq
power_supply: MAX17042: Support additional properties
max8903_charger: Allow platform data to be __initdata
power_supply: Add charger driver for MAX8998/LP3974
power_supply: Add charger driver for MAX8997/8966
max17042_battery: Remove obsolete cleanup for clientdata
twl4030_charger: Fix warnings
wm831x_power: Support multiple instances
wm831x_backup: Support multiple instances
apm_power: Fix style error in macros
s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
bq20z75: Enable detection after registering
bq20z75: Add support for external notification
| drivers/power/Kconfig | diff1 | | diff2 | | blob | history |
| drivers/power/Makefile | diff1 | | diff2 | | blob | history |