Linus Torvalds 5957e33d6a Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: (21 commits) power_supply: Add MAX17042 Fuel Gauge Driver olpc_battery: Fix up XO-1.5 properties list olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW olpc_battery: Add support for CHARGE_NOW olpc_battery: Add support for CHARGE_FULL_DESIGN olpc_battery: Ambient temperature is not available on XO-1.5 jz4740-battery: Should include linux/io.h s3c_adc_battery: Add gpio_inverted field to pdata power_supply: Don't use flush_scheduled_work() power_supply: Fix use after free and memory leak gpio-charger: Fix potential race between irq handler and probe/remove gpio-charger: Provide default name for the power_supply gpio-charger: Check result of kzalloc jz4740-battery: Check if platform_data is supplied isp1704_charger: Detect charger after probe isp1704_charger: Set isp->dev before anything needs it isp1704_charger: Detect HUB/Host chargers isp1704_charger: Correct length for storing model power_supply: Add gpio charger driver jz4740-battery: Protect against concurrent battery readings ...		2011-01-14 09:25:59 -08:00
..
apm_power.c
bq20z75.c
bq27x00_battery.c
collie_battery.c
da9030_battery.c
ds2760_battery.c	Merge git://git.infradead.org/battery-2.6	2011-01-14 09:25:59 -08:00
ds2782_battery.c
gpio-charger.c
intel_mid_battery.c	Merge git://git.infradead.org/battery-2.6	2011-01-14 09:25:59 -08:00
isp1704_charger.c
jz4740-battery.c
Kconfig
Makefile
max8925_power.c
max17040_battery.c
max17042_battery.c
olpc_battery.c
pcf50633-charger.c
pda_power.c
pmu_battery.c
power_supply_core.c
power_supply_leds.c
power_supply_sysfs.c
power_supply.h
s3c_adc_battery.c	Merge git://git.infradead.org/battery-2.6	2011-01-14 09:25:59 -08:00
test_power.c
tosa_battery.c
twl4030_charger.c
wm97xx_battery.c
wm831x_backup.c
wm831x_power.c
wm8350_power.c
z2_battery.c