Linus Torvalds 45352bbf48 Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: power_supply: Makefile cleanup bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove() power_supply: Introduce maximum current property power_supply: Add types for USB chargers ds2782_battery: Fix units power_supply: Add driver for TWL4030/TPS65950 BCI charger bq20z75: Add support for more power supply properties wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove() jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove() ds2760_battery: Add missing kfree(di) in ds2760_battery_remove() olpc_battery: Fix endian neutral breakage for s16 values ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency pcf50633-charger: Add missing sysfs_remove_group() power_supply: Add driver for TI BQ20Z75 gas gauge IC wm831x_power: Remove duplicate chg mask omap: rx51: Add support for USB chargers power_supply: Add isp1704 charger detection driver		2010-10-26 10:14:23 -07:00
..
apm_power.c	apm_power: Add missing break statement	2010-09-08 14:35:10 +04:00
bq20z75.c	bq20z75: Add support for more power supply properties	2010-09-28 16:42:35 +04:00
bq27x00_battery.c	bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove()	2010-10-06 17:38:15 +04:00
collie_battery.c
da9030_battery.c
ds2760_battery.c	ds2760_battery: Add missing kfree(di) in ds2760_battery_remove()	2010-09-28 15:16:23 +04:00
ds2782_battery.c	ds2782_battery: Fix units	2010-10-06 17:36:49 +04:00
intel_mid_battery.c	intel_pmic_battery: Fix battery charging status on mrst	2010-08-24 18:27:57 +04:00
isp1704_charger.c	power_supply: Add isp1704 charger detection driver	2010-08-19 16:25:20 +04:00
jz4740-battery.c	jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove()	2010-09-28 15:52:23 +04:00
Kconfig	power_supply: Add driver for TWL4030/TPS65950 BCI charger	2010-09-30 19:28:09 +04:00
Makefile	power_supply: Makefile cleanup	2010-10-06 17:38:42 +04:00
max8925_power.c
max17040_battery.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
olpc_battery.c	olpc_battery: Fix endian neutral breakage for s16 values	2010-09-28 15:14:31 +04:00
pcf50633-charger.c	pcf50633-charger: Add missing sysfs_remove_group()	2010-09-22 16:14:49 +04:00
pda_power.c
pmu_battery.c
power_supply_core.c
power_supply_leds.c
power_supply_sysfs.c	power_supply: Introduce maximum current property	2010-10-06 17:37:22 +04:00
power_supply.h
s3c_adc_battery.c	Add s3c-adc-battery driver	2010-07-23 17:08:41 +04:00
test_power.c
tosa_battery.c
twl4030_charger.c	power_supply: Add driver for TWL4030/TPS65950 BCI charger	2010-09-30 19:28:09 +04:00
wm97xx_battery.c	[ARM] wm97xx_batt: remove now useless header file	2010-08-05 14:32:15 +08:00
wm831x_backup.c
wm831x_power.c	wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove()	2010-09-28 15:52:34 +04:00
wm8350_power.c
z2_battery.c	[ARM] pxa/z2: fix missing include in battery driver	2010-06-13 23:55:13 +08:00