diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-23 03:59:09 +0100 |
| commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
| tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /arch/x86 | |
| parent | Merge branch 'next/misc' into for-next (diff) | |
| parent | riscv: provide a flat image loader (diff) | |
| download | linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.xz linux-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.zip | |
Merge branch 'next/nommu' into for-next
Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions