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	Driver Core: add ability for class_for_each_device to start in middle of list	2008-07-21 21:54:47 -07:00
ds2760_battery.c	drivers/power: fix platform driver hotplug/coldplug	2008-07-25 10:53:28 -07:00
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	power_supply: fix up CHARGE_COUNTER output to be more precise	2008-05-19 01:44:36 +04:00
palmtx_battery.c	[ARM] 5155/1: PalmTX battery monitor	2008-07-10 12:15:32 +01:00
pda_power.c	drivers/power: fix platform driver hotplug/coldplug	2008-07-25 10:53:28 -07:00
pmu_battery.c	PMU battery: filenames in sysfs with spaces	2008-05-03 03:40:42 +04:00
power_supply_core.c	Driver Core: add ability for class_for_each_device to start in middle of list	2008-07-21 21:54:47 -07:00
power_supply_leds.c	power: replace remaining __FUNCTION__ occurrences	2008-04-29 08:05:58 -07:00
power_supply_sysfs.c	Merge branch 'master' of /home/cbou/linux-2.6	2008-07-30 02:05:23 +04:00
power_supply.h	Driver core: change add_uevent_var to use a struct	2007-10-12 14:51:01 -07:00
tosa_battery.c	power_supply: Sharp SL-6000 (tosa) batteries support	2008-07-01 02:43:12 +04:00