Merge remote-tracking branch 'risc-v/for-next'

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

Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)

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

Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)
diff --cc Documentation/features/vm/ioremap_prot/arch-support.txt
Simple merge
diff --cc arch/riscv/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 9 Dec 2018 23:03:43 +0000 (10:03 +1100)
		1	2
Documentation/features/vm/ioremap_prot/arch-support.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history