]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'driver-core/driver-core-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:33:08 +0000 (16:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 06:33:08 +0000 (16:33 +1000)
commit7218e72358b25eb615587b8444b6eb0b25d71547
tree200bb3d61badb1273a61e43ea313550f5dbd0b81
parent3c70e564b139aef410807848756e701726951b54
parent4ce535ec0084f0d712317cb99d383cad3288e713
Merge remote-tracking branch 'driver-core/driver-core-next'

# Conflicts:
# drivers/of/property.c
MAINTAINERS
drivers/base/dd.c
drivers/clk/clk.c
drivers/of/property.c
drivers/power/supply/axp20x_usb_power.c
drivers/power/supply/sbs-battery.c
drivers/regulator/qcom_spmi-regulator.c