diff options
author | 2017-04-20 15:31:08 -0700 | |
---|---|---|
committer | 2017-04-20 15:31:08 -0700 | |
commit | c154165e93b7f1ee9c63906fa200bc735098d47d (patch) | |
tree | 3903e3f67807b2b9a08fdd3dd4d2636c0ad974a3 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge tag 'trace-v4.11-rc5-5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
parent | mm: prevent NR_ISOLATE_* stats from going negative (diff) | |
download | wireguard-linux-c154165e93b7f1ee9c63906fa200bc735098d47d.tar.xz wireguard-linux-c154165e93b7f1ee9c63906fa200bc735098d47d.zip |
Merge branch 'akpm' (patches from Andrew)
Merge two mm fixes from Andrew Morton.
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: prevent NR_ISOLATE_* stats from going negative
Revert "mm, page_alloc: only use per-cpu allocator for irq-safe requests"
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions