Merge tag 'ib-mfd-power-v5.13' into psy-next
authorSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 5 Apr 2021 10:38:08 +0000 (12:38 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Mon, 5 Apr 2021 10:38:08 +0000 (12:38 +0200)
Immutable branch between MFD and Power due for the v5.13 merge window.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1  2 
drivers/power/supply/Kconfig
drivers/power/supply/pm2301_charger.c

Simple merge
Simple merge