Merge git://git.infradead.org/~dwmw2/battery-2.6

* 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)

diff --combined drivers/Kconfig
index 4e6487d461f39f6dfa3c1bcbfb4e6570ec836231,c546de307caf166cc043fb34792c8a2301704fc7..7916f4b86d23c31eae93fbabde3a9cad6eb3dc90
--- 1/drivers/Kconfig
--- 2/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -24,6 -24,8 +24,6 @@@ source "drivers/scsi/Kconfig
  
  source "drivers/ata/Kconfig"
  
 -source "drivers/cdrom/Kconfig"
 -
  source "drivers/md/Kconfig"
  
  source "drivers/message/fusion/Kconfig"
@@@ -52,6 -54,8 +52,8 @@@ source "drivers/spi/Kconfig
  
  source "drivers/w1/Kconfig"
  
+ source "drivers/power/Kconfig"
+ 
  source "drivers/hwmon/Kconfig"
  
  source "drivers/mfd/Kconfig"