diff options
author | 2019-11-22 18:59:09 -0800 | |
---|---|---|
committer | 2019-11-22 18:59:09 -0800 | |
commit | 5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb (patch) | |
tree | b9f61d0544ed06b7f07000a11797711cdd97d83f /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'next/misc' into for-next (diff) | |
parent | riscv: provide a flat image loader (diff) | |
download | linux-rng-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.tar.xz linux-rng-5ba9aa56e6d3e8fddb954c2f818d1ce0525235bb.zip |
Merge branch 'next/nommu' into for-next
Conflicts:
arch/riscv/boot/Makefile
arch/riscv/include/asm/sbi.h
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions