From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2009 16:59:33 +0000 (-0800)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=48e902f0a3aea4b6b3a73e9d277b92024a493e6d;p=deliverable%2Flinux.git

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

* git://git.infradead.org/battery-2.6:
  power_supply_sysfs: Handle -ENODATA in a special way
  wm831x_backup: Remove unused variables
  gta02: Set pcf50633 charger_reference_current_ma
  pcf50633: Query charger status directly
  pcf50633: Properly reenable charging when the supply conditions change
  pcf50633: Get rid of charging restart software auto-triggering
  pcf50633: introduces battery charging current control
  pcf50633: Add ac power supply class to the charger
  wm831x: Factor out WM831x backup battery charger
---

48e902f0a3aea4b6b3a73e9d277b92024a493e6d