Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 03:52:55 +0000 (14:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 1 Mar 2022 03:52:55 +0000 (14:52 +1100)
commit9c25111be60381d7b8706d6ce83df24869154467
treec3be4557a45003082f2913371c9a107e5a5b3e76
parent84a9f244f9065a073b98b91b2d1ccb0d1f275f5e
parentaf16d860a23b5183b6976117ad0478056edf0584
Merge branch 'irq/irqchip-next' of git://git./linux/kernel/git/maz/arm-platforms.git

# Conflicts:
# drivers/pinctrl/pinctrl-starfive.c
drivers/pinctrl/pinctrl-starfive.c