Commit aff2b5fc authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

automerging branch "github.com-riscv/wip-dma" into "riscv-all"

# Conflicts:
#	arch/riscv/kernel/setup.c
parents 1bf86a7f 4c98034f
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment