Anton Vorontsov f056878332 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	drivers/power/wm97xx_battery.c

2009-09-23 03:49:27 +04:00

..

apm_power.c

…

bq27x00_battery.c

…

da9030_battery.c

da9030_battery: Fix race between event handler and monitor

2009-06-09 01:12:38 +04:00

ds2760_battery.c

ds2760_battery: Fix integer overflow for time_to_empty_now

2009-09-04 20:26:40 +04:00

ds2782_battery.c

Add ds2782 battery gas gauge driver

2009-07-01 02:36:58 +04:00

Kconfig

power_supply: Add driver for the PMU on WM831x PMICs

2009-09-04 21:02:32 +04:00

Makefile

power_supply: Add driver for the PMU on WM831x PMICs

2009-09-04 21:02:32 +04:00

max17040_battery.c

Add MAX17040 Fuel Gauge driver

2009-06-09 00:53:21 +04:00

olpc_battery.c

power_supply: Add a charge_type property, and use it for olpc driver

2009-07-02 18:14:37 +04:00

pcf50633-charger.c

…

pda_power.c

…

pmu_battery.c

…

power_supply_core.c

power_supply: get_by_name and set_charged functionality

2009-07-30 17:49:15 +04:00

power_supply_leds.c

…

power_supply_sysfs.c

power_supply: Add a charge_type property, and use it for olpc driver

2009-07-02 18:14:37 +04:00

power_supply.h

…

tosa_battery.c

…

wm97xx_battery.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-23 03:49:27 +04:00

wm831x_power.c

power_supply: Add driver for the PMU on WM831x PMICs

2009-09-04 21:02:32 +04:00

wm8350_power.c

wm8350_power: Implement charge type property

2009-07-14 18:05:56 +04:00