tree 17589e88fe53f2492db4bbc133e324bbae701571
parent c25949d4cc22449414fe73bc930bdf650078e877
parent 265b60497a57da56a4be7d5c72983ae89dc0765e
author Linus Torvalds <torvalds@linux-foundation.org> 1452797111 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1452797111 -0800
mergetag object 265b60497a57da56a4be7d5c72983ae89dc0765e
 type commit
 tag for-v4.5
 tagger Sebastian Reichel <sre@kernel.org> 1452729880 +0100
 
 power supply and reset changes for the v4.4 series
 
  * uncouple CONFIG_POWER_RESET from CONFIG_POWER_SUPPLY
  * misc. fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCgAGBQJWlubEAAoJENju1/PIO/qaMzUP/0NNd50liWeuZucqZdJ+YJZB
 mvjsozTkEYO9n0k55XMLkh2/FRbhDLVkDomprKzdkoksTihKgjxqtY3aVpL1zjpY
 cEwDlbip3kfTcrJ4xhFzdWgZvxY3tuxUfWx5zqwb/YysXyJ1AFHaJlEmnY241NwO
 3nWUDfVKsOflzPQWmVV1wXBUwd+WWhjkEy3KQWpKG4lR7Xjc26KL7/jxtjouQqiP
 gTN1cNu02clmZRnZbyizNyvmAVqSckFQ/SXQhaFDH52jgA4okbc3I6TV02JlNZ3T
 UlGkmtx0le7LO3t5x/u6VCVZvvxKuvYHxwRU/hiyQaveGO7yu6HtaBD/FUsY8/fs
 +rMqAbpPI7zYQZMse9blAdNQk7iGEqb8hHRWFUZqE8ye8qeqrAiS80uyuWUaztjf
 QCq5IDMHEGboMdsuiv4uHBf2OjTAeS2lXqaFogUxlMgzgoOaleICyI2LdQ5I1Qyn
 NFkWomPdVmnvTkdIPr61170zOGREQR8Cg7pbw74OBCu3q+1VNZiMd0/+BRm8Po4m
 vP1/RIL3quaDzpziDUvnieacvEzQeiArFHk0GilxL11h1ToA8rSvaWSdznO6JLIW
 JR5gWEJmLRb8daiaD/jr2+sTamkYKVA9Xyi1gpc57ISa8gpkL56Pu0zxsfQxDI08
 HmgU+neqvuIwsx5MAEUp
 =8+p9
 -----END PGP SIGNATURE-----

Merge tag 'for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply and reset updates from Sebastian Reichel:
 "I have mostly fixes in the power-supply tree for the 4.5 kernel.  I
  should mention, that the top-most commit has not been in next, but
  it's a fix changing only a single register offset.

  Summary:

   - uncouple CONFIG_POWER_RESET from CONFIG_POWER_SUPPLY

   - misc fixes"

* tag 'for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: bq27xxx_battery: Fix bq27541 AveragePower register address
  power: test_power: correctly handle empty writes
  power: generic-adc-battery: use to_delayed_work
  power: isp1704_charger: Fix isp1704_write() definition
  power: bq27xxx: fix register numbers of bq27500
  power: bq27xxx: fix reading for bq27000 and bq27010
  power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them
  power: bq27xxx_battery: Reorganize I2C into a module
  power: bq27xxx: don't fill system log by missing battery
  power: max8903_charger: set IRQF_ONESHOT if no primary handler is specified
  power/reset: at91-reset: add missing of_node_put
  power: ds2782_battery: constify ds278x_battery_ops structure
  power: bq2415x_charger: Delete unnecessary checks before the function call "of_node_put"