diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-05 16:35:30 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-05 16:35:30 +0200 |
commit | 8c6e549a447c51f4f8c0ba7f1e444469f75a354a (patch) | |
tree | b3b423b8eb711732cad912d9340d08cea0f132bc /net/ipv4/ip_tunnel.c | |
parent | perf/documentation: Add description for conditional branch filter (diff) | |
parent | uprobes/x86: Rename arch_uprobe->def to ->defparam, minor comment updates (diff) | |
download | linux-8c6e549a447c51f4f8c0ba7f1e444469f75a354a.tar.xz linux-8c6e549a447c51f4f8c0ba7f1e444469f75a354a.zip |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core
Pull uprobes tmpfs support patches from Oleg Nesterov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions