diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-22 04:07:37 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-22 04:10:01 -0400 |
| commit | 3ac1bbcf13c56a19927df670f429eb0c3c11f8e5 (patch) | |
| tree | 693e2b7f1a9cb0c6ed6d44375e370e1ae08c7ac9 /tools/perf/util/include | |
| parent | a2d063ac216c1618bfc2b4d40b7176adffa63511 (diff) | |
| parent | 5538becaec9ca2ff21e7826372941dc46f498487 (diff) | |
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 <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/include')
| -rw-r--r-- | tools/perf/util/include/linux/list.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/include/linux/list.h b/tools/perf/util/include/linux/list.h index 356c7e467b83..ed33609b9e33 100644 --- a/tools/perf/util/include/linux/list.h +++ b/tools/perf/util/include/linux/list.h | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/prefetch.h> | ||
| 3 | |||
| 2 | #include "../../../../include/linux/list.h" | 4 | #include "../../../../include/linux/list.h" |
| 3 | 5 | ||
| 4 | #ifndef PERF_LIST_H | 6 | #ifndef PERF_LIST_H |