diff options
author | 2016-03-15 09:00:12 +0100 | |
---|---|---|
committer | 2016-03-15 09:01:06 +0100 | |
commit | 8bc6782fe20bd2584c73a35c47329c9fd0a8d34c (patch) | |
tree | c7fc6f467ee212e4ef442e70843c48fcf3c67c17 /tools/perf/scripts/python/syscall-counts.py | |
parent | Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | rcu: Remove rcu_user_hooks_switch (diff) | |
download | linux-dev-8bc6782fe20bd2584c73a35c47329c9fd0a8d34c.tar.xz linux-dev-8bc6782fe20bd2584c73a35c47329c9fd0a8d34c.zip |
Merge commit 'fixes.2015.02.23a' into core/rcu
Conflicts:
kernel/rcu/tree.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/syscall-counts.py')
0 files changed, 0 insertions, 0 deletions