Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 02:43:51 +0000 (13:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Feb 2022 02:43:51 +0000 (13:43 +1100)
commiteef4f7743dfbf49b6a8123a71d4c44cff8508a94
treef53af6729371387e2c9042b647fcb6722af66d39
parentbb9a6ff7ee7dd5ac8294e9c06c60a93b4d73439c
parent27446562a1d9946a89231504a3c64eff2e7ca41d
Merge branch 'driver-core-next' of git://git./linux/kernel/git/gregkh/driver-core.git

# Conflicts:
# drivers/power/supply/ab8500_chargalg.c
drivers/base/devtmpfs.c
drivers/power/supply/ab8500_fg.c