Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:17:50 +0000 (16:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 05:17:50 +0000 (16:17 +1100)
commita1b1d2e798b9066c09159a457e1e49ec578dba66
tree68b48872bba7f2ffbe5885daf98c14f112fc3e96
parent094587138b0121fa52d87951743e496b066ec64e
parentb26c5f03a64538d8897851458ed49af39001a869
Merge branch 'extcon-next' of git://git./linux/kernel/git/chanwoo/extcon.git

# Conflicts:
# drivers/power/supply/max8997_charger.c
drivers/power/supply/axp288_charger.c
drivers/power/supply/max8997_charger.c
drivers/usb/dwc3/drd.c