diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-15 19:25:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-15 19:25:07 +0200 |
| commit | ad466db5b0c302e85ad96c42a43194c234cbd862 (patch) | |
| tree | 991cd929069b4bbd11a4c8f0a8f1940cce82a618 /include/net/ip.h | |
| parent | fbdd17ec5ce2e5e4027356fcfde769b88d15702f (diff) | |
| parent | c9e87a472594fd237b2d19dcbe4a3424297f0b1a (diff) | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/urgent
Pull perf/urgent fixes from Jiri Olsa:
* Instead of redirecting flex output, use -o (Cody P Schafer)
* Fix double free in perf test 21 (Adrian Hunter)
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ip.h')
0 files changed, 0 insertions, 0 deletions