Anton Vorontsov 9fec6060d9 Merge branch 'master' of /home/cbou/linux-2.6 ... Conflicts: drivers/power/Kconfig drivers/power/Makefile		2008-07-30 02:05:23 +04:00
..
apm_power.c
ds2760_battery.c
Kconfig	Merge branch 'master' of /home/cbou/linux-2.6	2008-07-30 02:05:23 +04:00
Makefile	Merge branch 'master' of /home/cbou/linux-2.6	2008-07-30 02:05:23 +04:00
olpc_battery.c
palmtx_battery.c
pda_power.c
pmu_battery.c
power_supply_core.c
power_supply_leds.c
power_supply_sysfs.c	Merge branch 'master' of /home/cbou/linux-2.6	2008-07-30 02:05:23 +04:00
power_supply.h
tosa_battery.c