• Linus Torvalds's avatar
    Merge git://git.infradead.org/battery-2.6 · 5957e33d
    Linus Torvalds authored
    * git://git.infradead.org/battery-2.6: (21 commits)
      power_supply: Add MAX17042 Fuel Gauge Driver
      olpc_battery: Fix up XO-1.5 properties list
      olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW
      olpc_battery: Add support for CHARGE_NOW
      olpc_battery: Add support for CHARGE_FULL_DESIGN
      olpc_battery: Ambient temperature is not available on XO-1.5
      jz4740-battery: Should include linux/io.h
      s3c_adc_battery: Add gpio_inverted field to pdata
      power_supply: Don't use flush_scheduled_work()
      power_supply: Fix use after free and memory leak
      gpio-charger: Fix potential race between irq handler and probe/remove
      gpio-charger: Provide default name for the power_supply
      gpio-charger: Check result of kzalloc
      jz4740-battery: Check if platform_data is supplied
      isp1704_charger: Detect charger after probe
      isp1704_charger: Set isp->dev before anything needs it
      isp1704_charger: Detect HUB/Host chargers
      isp1704_charger: Correct length for storing model
      power_supply: Add gpio charger driver
      jz4740-battery: Protect against concurrent battery readings
      ...
    5957e33d
intel_mid_battery.c 21.5 KB