Merge git://git.infradead.org/~dwmw2/battery-2.6
Linus Torvalds [Tue, 10 Jul 2007 21:47:59 +0000 (14:47 -0700)]
* git://git.infradead.org/~dwmw2/battery-2.6:
  [BATTERY] ds2760 W1 slave
  [BATTERY] One Laptop Per Child power/battery driver
  [BATTERY] Apple PMU driver
  [BATTERY] 1-Wire ds2760 chip battery driver
  [BATTERY] APM emulation driver for class batteries
  [BATTERY] pda_power platform driver
  [BATTERY] Universal power supply class (was: battery class)

1  2 
drivers/Kconfig

diff --cc drivers/Kconfig
Simple merge