Skip to content
Commit 5ba9aa56 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge branch 'next/nommu' into for-next 

Conflicts:
	arch/riscv/boot/Makefile
	arch/riscv/include/asm/sbi.h
parents 4a979862 405fe7aa
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment