Merge tag 'for-v3.6' of git://git.infradead.org/battery-2.6

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
  ...

diff --cc drivers/mfd/twl-core.c
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/power/ds2781_battery.c
index 5f92a4bb33f95aaafe772c3aeea1b2bc54a00186,0e87e54b4ab13420944577a6679d87c4f72846fa..7a1ff4e4cf9a6452f1b58b2074638aac105cdc93
--- 1/drivers/power/ds2781_battery.c
--- 2/drivers/power/ds2781_battery.c
+++ b/drivers/power/ds2781_battery.c
@@@ -61,10 -62,14 +61,10 @@@ static inline struct power_supply *to_p
  static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
        char *buf, int addr, size_t count, int io)
  {
 -      if (dev_info->mutex_holder == current)
 -              return w1_ds2781_io_nolock(dev_info->w1_dev, buf, addr,
 -                              count, io);
 -      else
 -              return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
 +      return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
  }
  
- int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
+ static int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
                int addr, size_t count)
  {
        return ds2781_battery_io(dev_info, buf, addr, count, 0);

diff --cc drivers/power/pda_power.c
Simple merge

diff --cc drivers/power/twl4030_charger.c
Simple merge

diff --cc drivers/thermal/thermal_sys.c
Simple merge

diff --cc include/linux/i2c/twl.h
Simple merge

diff --cc include/linux/thermal.h
Simple merge