Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:19:31 +0000 (09:19 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 22:19:31 +0000 (09:19 +1100)
commite4bbabadeccb9f83fd1f6ad45bf89da5cc051575
tree84aed6f902519ff377fd97f0c6e797664befa3a6
parent61a01d18a43833575ac669585c62a4cf3bc4a86f
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