diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:20:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-22 19:20:52 -0700 |
commit | 0c326331c8b107abc0a160e8899d749150b8f76a (patch) | |
tree | 186df49fe26b66ca7c003d26152ef734a5ff35fd /include/sound/minors.h | |
parent | ad792f4f46e12bae58298fc64f5139b99664a773 (diff) | |
parent | 2a721dfc8c677588fc98d818dfad3354081c6ddb (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
Diffstat (limited to 'include/sound/minors.h')
0 files changed, 0 insertions, 0 deletions