diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 22:25:16 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-31 22:25:16 (GMT) |
| commit | c8192ba416397ad6ce493f186da40767ce086c3b (patch) | |
| tree | 2872bdbf2e40d5709e246fff8f3456b639f1bb79 /MAINTAINERS | |
| parent | 9c6a019c6edf8591e34ae9da51bac7684131d905 (diff) | |
| parent | b68c3161430a4c7c0a001e658188bfea6a2fe5bd (diff) | |
| download | linux-c8192ba416397ad6ce493f186da40767ce086c3b.tar.xz | |
Merge tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset changes from Sebastian Reichel:
- new reset driver for ZTE SoCs
- add support for sama5d3 reset handling
- overhaul of twl4030 charger driver
- misc fixes and cleanups
* tag 'for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply: (35 commits)
bq2415x_charger: Allow to load and use driver even if notify device is not registered yet
twl4030_charger: fix compile error when TWL4030_MADC not available.
power: bq24190_charger: Fix charge type sysfs property
power: Allow compile test of GPIO consumers if !GPIOLIB
power: Export I2C module alias information in missing drivers
twl4030_charger: Increase current carefully while watching voltage.
twl4030_charger: add ac/mode to match usb/mode
twl4030_charger: add software controlled linear charging mode.
twl4030_charger: enable manual enable/disable of usb charging.
twl4030_charger: allow max_current to be managed via sysfs.
twl4030_charger: distinguish between USB current and 'AC' current
twl4030_charger: allow fine control of charger current.
twl4030_charger: split uA calculation into a function.
twl4030_charger: trust phy to determine when USB power is available.
twl4030_charger: correctly handle -EPROBE_DEFER from devm_usb_get_phy_by_node
twl4030_charger: convert to module_platform_driver instead of ..._probe.
twl4030_charger: use runtime_pm to keep usb phy active while charging.
rx51-battery: Set name to rx51-battery
MAINTAINERS: AVS is not maintained via power supply tree
power: olpc_battery: clean up eeprom read function
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8b3115c..d539557 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8093,6 +8093,7 @@ T: git git://git.infradead.org/battery-2.6.git S: Maintained F: include/linux/power_supply.h F: drivers/power/ +X: drivers/power/avs/ PNP SUPPORT M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> |