]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:20:52 +0000 (19:20 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:20:52 +0000 (19:20 -0700)
* 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


Trivial merge