Merge git://git.infradead.org/~dwmw2/battery-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 10 Jul 2007 21:47:59 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 10 Jul 2007 21:47:59 +0000 (14:47 -0700)
commit5f60cfd932b42c69ed3226400cb5eab152576c3a
tree70e4feba5158e76060d36a6c015be8297c294bca
parent9f9d76321659b5ebc9939101481f7c3ce228ea6e
parentd7ce6d1d5f6e307a2fbb69626cf120e20e793fe7
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)
drivers/Kconfig