mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-30 14:40:20 -04:00
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
Conflicts: drivers/regulator/act8865-regulator.c
This commit is contained in: