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

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

Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)

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

Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)
diff --cc kernel/panic.c
Simple merge
diff --cc kernel/printk/printk.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 00:18:06 +0000 (11:18 +1100)
		1	2
kernel/panic.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/printk/printk.c	patch \|	diff1 \|	diff2 \|	blob \| history