Linus Torvalds 8f41958bdd Merge git://git.infradead.org/battery-2.6 ...

* git://git.infradead.org/battery-2.6:
  git-battery vs git-acpi
  Power supply class and drivers: remove non obligatory return statements
  pda_power: clean up irq, timer
  MAINTAINERS: Add maintainers for power supply subsystem and drivers

Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually

2007-07-15 16:56:12 -07:00

..

apm_power.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

ds2760_battery.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

Kconfig

PDA_POWER depends on having request_irq()

2007-07-15 16:40:51 -07:00

Makefile

[BATTERY] One Laptop Per Child power/battery driver

2007-07-10 11:28:22 +01:00

olpc_battery.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

pda_power.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

pmu_battery.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

power_supply_core.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

power_supply_leds.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

power_supply_sysfs.c

Power supply class and drivers: remove non obligatory return statements

2007-07-15 22:32:38 +04:00

power_supply.h

[BATTERY] Universal power supply class (was: battery class)

2007-07-10 11:25:44 +01:00