• Linus Torvalds's avatar
    Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6 · 4b24ff71
    Linus Torvalds authored
    Pull battery updates from Anton Vorontsov:
     "The tag contains just a few battery-related changes for v3.6.  It's is
      all pretty straightforward, except one thing.
    
      One of our patches added thermal support for power supply class, but
      thermal/ subsystem changed under our feet.  We (well, Stephen, that
      is) caught the issue and it was decided[1] that I'd just delay the
      battery pull request, and then will fix it up by merging upstream back
      into battery tree at the specific commit.
    
      That's not all though: another[2] small fixup for thermal subsystem
      was needed to get rid of a warning in power supply subsystem (the
      warning was not drivers/power's "fault", the thermal registration
      function just needed a proper const annotation, which is also done by
      a small commit on top of the merge.
    
      So, to sum this up:
       - The 'master' branch of the battery tree was in the -next tree for
         weeks, was never rebased, altered etc.  It should be all OK;
       - Although, for-v3.6 tag contains the 'master' branch + merge + the
         warning fix.
    
      [1] http://lkml.org/lkml/2012/6/19/23
      [2] http://lkml.org/lkml/2012/6/18/28"
    
    * tag 'for-v3.6' of git://git.infradead.org/battery-2.6: (23 commits)
      thermal: Constify 'type' argument for the registration routine
      olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries
      olpc-battery: Add VOLTAGE_MAX_DESIGN property
      charger-manager: Fix build break related to EXTCON
      lp8727_charger: Move header file into platform_data directory
      power_supply: Add min/max alert properties for CAPACITY, TEMP, TEMP_AMBIENT
      bq27x00_battery: Add support for BQ27425 chip
      charger-manager: Set current limit of regulator for over current protection
      charger-manager: Use EXTCON Subsystem to detect charger cables for charging
      test_power: Add VOLTAGE_NOW and BATTERY_TEMP properties
      test_power: Add support for USB AC source
      gpio-charger: Use cansleep version of gpio_set_value
      bq27x00_battery: Add support for power average and health properties
      sbs-battery: Don't trigger false supply_changed event
      twl4030_charger: Allow charger to control the regulator that feeds it
      twl4030_charger: Add backup-battery charging
      twl4030_charger: Fix some typos
      max17042_battery: Support CHARGE_COUNTER power supply attribute
      smb347-charger: Add constant charge and current properties
      power_supply: Add constant charge_current and charge_voltage properties
      ...
    4b24ff71
Name
Last commit
Last update
..
adp5588.h Loading commit data...
adp8860.h Loading commit data...
adp8870.h Loading commit data...
ads1015.h Loading commit data...
apds990x.h Loading commit data...
at24.h Loading commit data...
atmel_mxt_ts.h Loading commit data...
bh1770glc.h Loading commit data...
dm355evm_msp.h Loading commit data...
ds620.h Loading commit data...
i2c-sh_mobile.h Loading commit data...
lm8323.h Loading commit data...
ltc4245.h Loading commit data...
max6639.h Loading commit data...
max732x.h Loading commit data...
mcs.h Loading commit data...
mms114.h Loading commit data...
mpr121_touchkey.h Loading commit data...
pca953x.h Loading commit data...
pca954x.h Loading commit data...
pcf857x.h Loading commit data...
pmbus.h Loading commit data...
pxa-i2c.h Loading commit data...
s6000.h Loading commit data...
sx150x.h Loading commit data...
tc35876x.h Loading commit data...
tps65010.h Loading commit data...
tsc2007.h Loading commit data...
twl.h Loading commit data...
twl4030-madc.h Loading commit data...