git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ad792f4 2a721df)
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)
commit0c326331c8b107abc0a160e8899d749150b8f76a
tree186df49fe26b66ca7c003d26152ef734a5ff35fdtree
parentad792f4f46e12bae58298fc64f5139b99664a773commit | diff
parent2a721dfc8c677588fc98d818dfad3354081c6ddbcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.