diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 12:11:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-09 12:11:09 -0700 |
| commit | a16afaf7928b74c30a4727cdcaa67bd10675a55d (patch) | |
| tree | ab6c4835991ac397d3c6eb1934ec5ea94e2098c0 /drivers/ide/q40ide.c | |
| parent | 2a70ea5cda00214a1d573acf19fa0cd06d947e38 (diff) | |
| parent | c42812da1395bf57a6f7b5934b5339a3a42c2c7d (diff) | |
Merge tag 'for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- bq27xxx: Add BQ27426 support
- ab8500: Drop AB8540/9540 support
- Introduced new usb_type property
- Properly document the power-supply ABI
- misc. cleanups and fixes
* tag 'for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
MAINTAINERS: add entry for LEGO MINDSTORMS EV3
power: supply: ab8500_charger: fix spelling mistake: "faile" -> "failed"
power: supply: axp288_fuel_gauge: Remove polling from the driver
power: supply: axp288_fuelguage: Do not bind when the fg function is not used
power: supply: axp288_charger: Do not bind when the charge function is not used
power: supply: axp288_charger: Support 3500 and 4000 mA input current limit
power: supply: s3c-adc-battery: fix driver data initialization
power: supply: charger-manager: Verify polling interval only when polling requested
power: supply: sysfs: Use enum to specify property
power: supply: ab8500: Drop AB8540/9540 support
power: supply: ab8500_fg: fix spelling mistake: "Disharge" -> "Discharge"
power: supply: simplify getting .drvdata
power: supply: bq27xxx: Add support for BQ27426
gpio-poweroff: Use gpiod_set_value_cansleep
Diffstat (limited to 'drivers/ide/q40ide.c')
0 files changed, 0 insertions, 0 deletions