• Linus Torvalds's avatar
    Merge git://git.infradead.org/battery-2.6 · 48e902f0
    Linus Torvalds authored
    * 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
    48e902f0
mach-gta02.c 14.9 KB