From: Linus Torvalds Date: Tue, 23 Oct 2007 02:20:52 +0000 (-0700) Subject: Merge git://git.infradead.org/battery-2.6 X-Git-Tag: v2.6.24-rc1~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0c326331c8b107abc0a160e8899d749150b8f76a;p=linux-2.6-omap-h63xx.git 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 --- 0c326331c8b107abc0a160e8899d749150b8f76a