diff options
| author | Ingo Molnar <[email protected]> | 2011-05-22 08:07:37 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2011-05-22 08:10:01 +0000 |
| commit | 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5 (patch) | |
| tree | 693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9 /net/unix/af_unix.c | |
| parent | extable, core_kernel_data(): Make sure all archs define _sdata (diff) | |
| parent | perf tools: Propagate event parse error handling (diff) | |
| download | kernel-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.tar.gz kernel-3ac1bbcf13c56a19927df670f429eb0c3c11f8e5.zip | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent
Conflicts:
tools/perf/builtin-top.c
Semantic conflict:
util/include/linux/list.h # fix prefetch.h removal fallout
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions