diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 11:36:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 11:36:20 -0800 |
| commit | 03d11a0e458d7008192585124e4c3313c2829046 (patch) | |
| tree | 8e9f5141e53d2d4bf435fbd56f8ae96790304b7f /fs/jfs/resize.c | |
| parent | ac26663572db5b64522b92f3941a58678a832a36 (diff) | |
| parent | 573189354b7c97cd2256b87cf083ee435584594e (diff) | |
Merge tag 'for-v3.14' of git://git.infradead.org/battery-2.6
Pull battery updates from Dmitry Eremin-Solenikov:
"I'm picking up power supply maintainership from Anton Vorontov. Could
you please pull battery-2.6 git tree changes prepared for the v3.14
release.
Highlights:
- Power supply notifier
- Several drivers gained DT support
- Added Maxim 14577 driver
- Change of maintainer"
* tag 'for-v3.14' of git://git.infradead.org/battery-2.6:
MAINTAINERS: Pick up power supply maintainership
max17042_battery: Add IRQF_ONESHOT flag to use default irq handler
gpio-charger: Support wakeup events
power_supply: Add charger support for Maxim 14577
dt: Binding documentation for isp1704 charger
isp1704_charger: Add DT support
charger-manager: of_cm_parse_desc() should be static
bq2415x_charger: Add DT support
power_supply: Add power_supply_get_by_phandle
bq2415x_charger: Use power_supply notifier for automode
power: reset: Add as3722 power-off driver
mfd: AS3722: Add dt node properties for system power controller
charger-manager: Support deivce tree in charger manager driver
charger-manager: Modify the way of checking battery's temperature
power_supply: Add power_supply notifier
Diffstat (limited to 'fs/jfs/resize.c')
0 files changed, 0 insertions, 0 deletions