From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Mar 2010 16:04:22 +0000 (-0800)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: firefly_0821_release~9833^2~3028
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1fae4cfb97302289bb5df6a8195eb28385d0b002;p=firefly-linux-kernel-4.4.55.git

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
---

1fae4cfb97302289bb5df6a8195eb28385d0b002