diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 10:45:11 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-14 10:45:11 -0800 |
commit | 5c43019f25977fb6119dff471d592321ed0d2333 (patch) | |
tree | 17589e88fe53f2492db4bbc133e324bbae701571 /Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt | |
parent | c25949d4cc22449414fe73bc930bdf650078e877 (diff) | |
parent | 265b60497a57da56a4be7d5c72983ae89dc0765e (diff) | |
download | blackbird-obmc-linux-5c43019f25977fb6119dff471d592321ed0d2333.tar.gz blackbird-obmc-linux-5c43019f25977fb6119dff471d592321ed0d2333.zip |
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"
Diffstat (limited to 'Documentation/devicetree/bindings/arm/rockchip/smp-sram.txt')
0 files changed, 0 insertions, 0 deletions