projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ad792f4
2a721df
)
Merge git://git.infradead.org/battery-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 02:20:52 +0000
(19:20 -0700)
committer
Linus 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