Linus Torvalds 16bb85bc12 Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: intel_mid_battery: Fix battery scaling intel_mid_battery: Fix the argument order to intel_scu_ipc_command olpc_battery: Fix build failure caused by sysfs changes Add s3c-adc-battery driver Intel MID platform battery driver Fix up trivial conflicts (battery drivers added from different branches) in drivers/power/{Kconfig,Makefile}		2010-08-12 09:58:33 -07:00
..
apm_power.c
bq27x00_battery.c
collie_battery.c
da9030_battery.c
ds2760_battery.c	ds2760_battery: Make charge_now and charge_full writeable	2010-05-19 12:14:42 +04:00
ds2782_battery.c	Merge git://git.infradead.org/users/cbou/battery-2.6.35	2010-07-27 09:22:55 -07:00
intel_mid_battery.c	intel_mid_battery: Fix battery scaling	2010-08-10 14:35:27 +04:00
jz4740-battery.c	POWER: Add JZ4740 battery driver.	2010-08-05 13:26:20 +01:00
Kconfig	Merge git://git.infradead.org/battery-2.6	2010-08-12 09:58:33 -07:00
Makefile	Merge git://git.infradead.org/battery-2.6	2010-08-12 09:58:33 -07: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	power: Remove owner field from attribute initialization code in OLPC driver	2010-08-10 15:33:09 -07:00
pcf50633-charger.c
pda_power.c
pmu_battery.c
power_supply.h	power_supply: Use attribute groups	2010-05-19 12:14:28 +04:00
power_supply_core.c	power_supply: Use attribute groups	2010-05-19 12:14:28 +04:00
power_supply_leds.c
power_supply_sysfs.c	power_supply: Fix regression for 'type' property	2010-05-25 13:52:58 +04:00
s3c_adc_battery.c	Add s3c-adc-battery driver	2010-07-23 17:08:41 +04:00
test_power.c	power_supply: Add test_power driver	2010-05-18 19:58:56 +04:00
tosa_battery.c
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
wm8350_power.c
z2_battery.c	[ARM] pxa/z2: fix missing include in battery driver	2010-06-13 23:55:13 +08:00