diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:25:26 +0100 |
| commit | ea2301b6220117398a1de4f4bc853fbe886d5e08 (patch) | |
| tree | 8823c3becd0b4fd3db9706892845cd02f760627a /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS (diff) | |
| parent | Merge tag 'trace-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| download | linux-dev-ea2301b6220117398a1de4f4bc853fbe886d5e08.tar.xz linux-dev-ea2301b6220117398a1de4f4bc853fbe886d5e08.zip | |
Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
Conflicts:
arch/x86/mm/init_64.c
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