From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Mar 2011 04:00:29 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: firefly_0821_release~7613^2~1784
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56a9ccb7ba5ffd5f285e3a9628cb446192c8639c;p=firefly-linux-kernel-4.4.55.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: (30 commits)
  bq20z75: Fix time and temp units
  bq20z75: Fix issues with present and suspend
  z2_battery: Fix count of properties
  s3c_adc_battery: Fix method names when PM not set
  z2_battery: Add MODULE_DEVICE_TABLE
  ds2782_battery: Add MODULE_DEVICE_TABLE
  bq20z75: Add MODULE_DEVICE_TABLE
  power_supply: Update power_supply_is_watt_property
  bq20z75: Add i2c retry mechanism
  bq20z75: Add optional battery detect gpio
  twl4030_charger: Make the driver atomic notifier safe
  bq27x00: Use single i2c_transfer call for property read
  bq27x00: Cleanup bq27x00_i2c_read
  bq27x00: Minor cleanups
  bq27x00: Give more specific reports on battery status
  bq27x00: Add MODULE_DEVICE_TABLE
  bq27x00: Add new properties
  bq27x00: Poll battery state
  bq27x00: Cache battery registers
  bq27x00: Add bq27000 support
  ...
---

56a9ccb7ba5ffd5f285e3a9628cb446192c8639c