]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'pinctrl/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:12:14 +0000 (16:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 06:12:14 +0000 (16:12 +1000)
commitc2d31cb95a3fab2f1785d8d65a7597b960142ce5
tree7dab955a42db446d20545fda7fb0f1c1ce8671a4
parent77f7cfd508a3de43fbca47427d46088fb82f35a6
parent2aefadc09b35c59ee3912b66984d617ee5510a55
Merge remote-tracking branch 'pinctrl/for-next'

# Conflicts:
# include/linux/pinctrl/pinconf-generic.h
MAINTAINERS
include/linux/pinctrl/pinconf-generic.h