1
0
Fork 0
alistair23-linux/include/linux/i2c
Linus Torvalds 4b24ff7110 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQIcBAABAgAGBQJQF9V8AAoJEGgI9fZJve1bLvkP/j/Nt1fBud2w5Q/NJr310hYJ
 NWIMSJwFbMhPoNd7sESznogXH8eHQ6YJP+CmkA5Gxr0t8pjEEJHEEyEcf1eNv6/c
 YDZfDB3TIaeYzulvRUkXMQ1f7hiA5Bq2t13yXeMM19+r9DzNZ51jZ3TXETLkpWZG
 BfZPg5wmP0xssXB3fjJMWuW5hVEc503WLpLFXkWfWKMU3PGdy/8DckV/YLvf2l7K
 1fkBLZry0gtruKqFbwcXhanP1JQ8FFFO8n1tSVLJhXXoym5twn/5GAgcpcKSFfJg
 mkGXAQLLuXKfERBIda7qbQl74HmTzYadCcueeXy1hTpom+VwfOpG+by2t/FrXT/M
 aJW6hfSLMgicG8FIuSYqbkutvijU9srU/YI00zrSGDBgi4sGKChRMf4sKQXnHO7X
 Lb7csQ7hEWsfG5gkgjRkmgZdhqWYoIxxe5Gv2Z9MKF27mHoSM03KHiZGlDJMrmNs
 w4KcU5H9tA62dT/UFszuu7NZenmsVS/ktiHWe5k+EXElZMZRrxKDJk2cvLPkRz/E
 VkXGvAmTDYPasZm29yzTnPKcuo6pfeOVJnUWybHOYxhkqAhJu1QzHCatqapgfy8E
 F2ODI5FoWtQES96B9t3tY4lTzq/0yUHcbiJt4BsyRcCGP+ggEQjCq0HGqOca12XX
 gxE20O3l+YQTCQIYKH+S
 =1NaS
 -----END PGP SIGNATURE-----

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
  ...
2012-07-31 18:08:25 -07:00
..
adp5588.h Input: adp5588 - add support for gpio names 2012-05-10 22:34:16 -07:00
adp8860.h backlight: adp8860: add support for ADP8861 & ADP8863 2010-05-26 13:08:33 +01:00
adp8870.h backlight: new driver for the ADP8870 backlight devices 2011-06-15 20:03:59 -07:00
ads1015.h hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
apds990x.h drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
at24.h misc: at24: describe platform_data with kernel_doc 2012-02-24 22:25:58 +01:00
atmel_mxt_ts.h Input: atmel_mxt_ts - allow board code to specify IRQ flags 2011-02-21 01:02:34 -08:00
bh1770glc.h drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor 2010-10-26 16:52:14 -07:00
dm355evm_msp.h
ds620.h hwmon: Support for Dallas Semiconductor DS620 2011-01-09 09:10:10 -08:00
i2c-sh_mobile.h i2c: i2c-sh_mobile bus speed platform data V2 2011-05-11 07:08:13 +01:00
lm8323.h
ltc4245.h hwmon: (ltc4245) Expose all GPIO pins as analog voltages 2010-08-14 21:08:49 +02:00
max732x.h gpio: add interrupt handling capability to max732x 2010-05-27 09:12:41 -07:00
max6639.h hwmon: Driver for Maxim MAX6639 2011-03-14 22:36:24 -07:00
mcs.h Input: mcs_touchkey - add support for suspend/resume 2011-02-23 21:43:31 -08:00
mms114.h Input: add MELFAS mms114 touchscreen driver 2012-07-17 23:16:17 -07:00
mpr121_touchkey.h Input: add driver FSL MPR121 capacitive touch sensor 2011-05-12 08:28:58 -07:00
pca953x.h GPIO: PCA953X: Increase size of invert variable to support 24 bit 2012-07-17 21:00:18 +02:00
pca954x.h i2c: I2C bus multiplexer driver pca954x 2010-08-11 18:21:03 +02:00
pcf857x.h
pmbus.h hwmon: PMBus device driver 2011-03-14 22:36:26 -07:00
pxa-i2c.h ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
s6000.h
sx150x.h gpio: sx150x: correct and refine reset-on-probe behavior 2010-09-09 18:57:24 -07:00
tc35876x.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
tps65010.h
tsc2007.h Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
twl.h The tag contains just a few battery-related changes for v3.6. It's is 2012-07-31 18:08:25 -07:00
twl4030-madc.h mfd: Turn on the twl4030-madc MADC clock 2011-10-24 14:09:10 +02:00