tree 186df49fe26b66ca7c003d26152ef734a5ff35fd
parent ad792f4f46e12bae58298fc64f5139b99664a773
parent 2a721dfc8c677588fc98d818dfad3354081c6ddb
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193106052 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193106052 -0700

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

* git://git.infradead.org/battery-2.6:
  apm_power: calculate to_full/to_empty time using energy
  apm_power: improve battery finding algorithm
  apm_power: fix obviously wrong logic for time reporting