| commit | 1fae4cfb97302289bb5df6a8195eb28385d0b002 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 04 08:04:22 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 04 08:04:22 2010 -0800 |
| tree | b432ca0e5354297e19725c5d2089fbd9922a26d0 | |
| parent | c8bf9fec478bb8d3c66067be2aaa4082b83da46c [diff] | |
| parent | afbc74fdc5b96552c384e57119b3cc13c840bf06 [diff] |
Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: power_supply: bq27x00: fix voltage and current units power_supply: bq27x00: add status and time properties power_supply: bq27x00: add BQ27500 support power_supply: bq27x00: fix temperature conversion power_supply: bq27x00: remove unused struct fields power_supply: bq27x00: remove double endian swap da9030_battery: fix spelling in comment wm97xx_battery: Clean up some warnings