tree 6dbb3a4c5ab4e7fc72172d8c11e7c0418b6559d1
parent 7f6cd5408a8ace522ca7f15893243e94ccc913e0
parent 9d233e8bb92e355fd20b14745c1d9ff402e0e685
author Linus Torvalds <torvalds@linux-foundation.org> 1260896373 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260896373 -0800

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