diff options
author | 2017-11-07 10:54:30 +0100 | |
---|---|---|
committer | 2017-11-07 10:54:30 +0100 | |
commit | 67caadc611eb1bf4aefc7c7a33dde30d12832569 (patch) | |
tree | d36388a7af0948af048542d25a35ae36d1570379 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts (diff) | |
parent | x86/build: Beautify build log of syscall headers (diff) | |
download | linux-dev-67caadc611eb1bf4aefc7c7a33dde30d12832569.tar.xz linux-dev-67caadc611eb1bf4aefc7c7a33dde30d12832569.zip |
Merge branch 'x86/build' into x86/asm, to fix up conflicts
Conflicts:
arch/x86/entry/syscalls/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions