tree 70e4feba5158e76060d36a6c015be8297c294bca
parent 9f9d76321659b5ebc9939101481f7c3ce228ea6e
parent d7ce6d1d5f6e307a2fbb69626cf120e20e793fe7
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184104079 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184104079 -0700

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)