linux

mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00

Files

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

2008-07-21 21:54:47 -07:00

ds2760_battery.c

2008-07-25 10:53:28 -07:00

Kconfig

2008-07-30 02:05:23 +04:00

Makefile

2008-07-30 02:05:23 +04:00

olpc_battery.c

2008-05-19 01:44:36 +04:00

palmtx_battery.c

2008-07-10 12:15:32 +01:00

pda_power.c

2008-07-25 10:53:28 -07:00

pmu_battery.c

2008-05-03 03:40:42 +04:00

power_supply_core.c

2008-07-21 21:54:47 -07:00

power_supply_leds.c

2008-04-29 08:05:58 -07:00

power_supply_sysfs.c

2008-07-30 02:05:23 +04:00

power_supply.h

2007-10-12 14:51:01 -07:00

tosa_battery.c

2008-07-01 02:43:12 +04:00