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 /arch/powerpc | |
parent | Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
parent | apm_power: calculate to_full/to_empty time using energy (diff) | |
download | linux-dev-0c326331c8b107abc0a160e8899d749150b8f76a.tar.xz linux-dev-0c326331c8b107abc0a160e8899d749150b8f76a.zip |
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 'arch/powerpc')
0 files changed, 0 insertions, 0 deletions