Merge remote-tracking branch 'printk/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/xmon/xmon.c
Simple merge
diff --cc mm/slub.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 01:36:08 +0000 (11:36 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/xmon/xmon.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/slub.c	patch \|	diff1 \|	diff2 \|	blob \| history