tree b9f61d0544ed06b7f07000a11797711cdd97d83f
parent 4a979862dde46b738316014ca4995eae2f428413
parent 405fe7aa0dbaa6cb8cfe62771eee67076d30aca1
author Paul Walmsley <paul.walmsley@sifive.com> 1574477949 -0800
committer Paul Walmsley <paul.walmsley@sifive.com> 1574477949 -0800

Merge branch 'next/nommu' into for-next

Conflicts:
	arch/riscv/boot/Makefile
	arch/riscv/include/asm/sbi.h