Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 28 Feb 2022 22:57:43 +0000 (09:57 +1100)
commita6502cf4bd7f1645e9cbb24e1ee4dee4225e646a
tree5b6cf8b661a813ef2fc19cf9122990d883c9411d
parent30645d9794090060f5c9f391bc227ee4ba8416e4
parent07cd7745c6f2081dac0aff7f57ea2b48c86de5fa
Merge branch 'next' of git://git./linux/kernel/git/greentime/linux.git

# Conflicts:
# arch/nds32/Kbuild
# arch/nds32/Kconfig
arch/nds32/Kbuild
arch/nds32/Kconfig
arch/nds32/Makefile