Files
kernel_google_wahoo/include/linux
Linus Torvalds 4b24ff7110 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
..
2012-07-17 15:11:37 -04:00
2012-07-30 18:16:01 -07:00
2012-07-30 18:15:23 -07:00
2012-04-23 14:23:32 +03:00
2012-05-15 17:30:30 -04:00
2012-06-06 15:20:22 -04:00
2012-07-30 17:25:21 -07:00
2012-06-29 11:38:17 -04:00
2012-03-20 21:29:46 -04:00
2012-06-06 19:12:30 -07:00
2012-07-30 17:25:11 -07:00
2012-02-28 16:02:54 +01:00
2012-03-23 16:58:38 -07:00
2012-04-14 15:24:26 -04:00
2012-02-20 19:46:36 +11:00
2012-05-02 14:15:27 -05:00
2012-05-25 12:46:23 +05:30
2012-05-10 12:00:56 +02:00
2012-06-27 15:42:24 -07:00
2012-05-29 23:28:33 -04:00
2012-07-22 23:57:58 +04:00
2012-04-25 12:25:05 +02:00
2012-04-27 10:46:45 +08:00
2012-07-05 15:04:10 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-05-12 14:28:14 +02:00
2012-03-26 21:47:19 +02:00
2012-07-02 15:11:12 +02:00
2012-03-27 22:45:26 -04:00
2012-07-20 11:07:00 -07:00
2012-03-20 12:47:48 +01:00
2012-05-07 10:58:57 -06:00
2012-03-20 12:47:47 +01:00
2012-07-18 08:59:58 -07:00
2012-04-09 11:16:55 -07:00
2012-03-08 10:50:35 -08:00
2012-05-31 17:49:32 -07:00
2012-05-31 17:49:30 -07:00
2012-03-08 10:50:35 -08:00
2012-05-11 10:56:56 +01:00
2012-05-29 23:28:41 -04:00
2012-03-15 21:41:34 +01:00
2012-05-09 13:58:06 -07:00
2012-05-22 15:20:28 -04:00
2012-07-14 16:35:40 +04:00
2012-07-09 16:42:24 -04:00
2012-05-26 14:17:30 -04:00
2012-03-05 15:26:47 -05:00
2012-07-10 10:32:06 -05:00
2012-05-21 14:31:48 +01:00
2012-03-21 17:55:01 -07:00
2012-06-20 14:39:36 -07:00
2012-05-14 14:15:32 -07:00
2012-07-12 07:54:46 -07:00
2012-05-12 15:53:42 -04:00
2012-06-15 12:56:57 +02:00
2012-03-20 21:29:38 -04:00
2012-03-28 18:30:03 +01:00
2012-07-30 17:25:20 -07:00
2012-06-01 12:58:52 -04:00
2012-07-22 12:39:33 -07:00
2012-07-02 13:40:06 +03:00
2012-06-05 17:32:30 +02:00
2012-07-16 22:31:34 -07:00
2012-06-13 21:16:42 +02:00
2012-05-14 18:53:19 -04:00
2012-07-30 17:25:16 -07:00
2012-07-23 00:58:46 -07:00
2012-03-22 19:43:43 -07:00
2012-07-22 23:57:55 +04:00
2012-06-18 13:42:03 +02:00
2012-07-06 20:17:46 -03:00
2012-05-22 12:16:16 +09:30
2012-03-28 18:30:03 +01:00