Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 22:43:42 +0000 (09:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Feb 2022 22:43:42 +0000 (09:43 +1100)
commit1383b4a61fbac14c0fe3af40db257a2bc573efc4
treeb4ed16d565f9296ded09b2ef964eb56f7f89d2f3
parentc1c4275a9254be00b3fab893f6fee10beadafd13
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