diff options
| author | Ingo Molnar <[email protected]> | 2017-11-07 09:54:30 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-11-07 09:54:30 +0000 |
| commit | 67caadc611eb1bf4aefc7c7a33dde30d12832569 (patch) | |
| tree | d36388a7af0948af048542d25a35ae36d1570379 /tools/perf/scripts/python/futex-contention.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 | kernel-67caadc611eb1bf4aefc7c7a33dde30d12832569.tar.gz kernel-67caadc611eb1bf4aefc7c7a33dde30d12832569.zip | |
Merge branch 'x86/build' into x86/asm, to fix up conflicts
Conflicts:
arch/x86/entry/syscalls/Makefile
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/futex-contention.py')
0 files changed, 0 insertions, 0 deletions