From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 Jul 2011 16:24:50 +0000 (-1000)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: firefly_0821_release~3680^2~4798
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f0d15c96d4ddcf32b6f910c4c2487ee705e4d493;p=firefly-linux-kernel-4.4.55.git

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

* git://git.infradead.org/battery-2.6:
  gpio-charger: Fix checking return value of request_any_context_irq
  power_supply: MAX17042: Support additional properties
  max8903_charger: Allow platform data to be __initdata
  power_supply: Add charger driver for MAX8998/LP3974
  power_supply: Add charger driver for MAX8997/8966
  max17042_battery: Remove obsolete cleanup for clientdata
  twl4030_charger: Fix warnings
  wm831x_power: Support multiple instances
  wm831x_backup: Support multiple instances
  apm_power: Fix style error in macros
  s3c_adc_battery: Fix annotation for s3c_adc_battery_probe()
  bq20z75: Enable detection after registering
  bq20z75: Add support for external notification
---

f0d15c96d4ddcf32b6f910c4c2487ee705e4d493