diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 03:16:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 03:16:14 -0500 |
| commit | 2b45e0f9f34f718725e093f4e335600811d7105a (patch) | |
| tree | 3c6d594539eb16fc955906da65b9fa7aacbc9145 /tools/perf/util/python-ext-sources | |
| parent | a85eba8814631d0d48361c8b9a7ee0984e80c03c (diff) | |
| parent | 15c81026204da897a05424c79263aea861a782cc (diff) | |
Merge branch 'linus' into x86/urgent
Merge in the x86 changes to apply a fix.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/python-ext-sources')
| -rw-r--r-- | tools/perf/util/python-ext-sources | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 239036fb2b2c..595bfc73d2ed 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources | |||
| @@ -18,4 +18,5 @@ util/cgroup.c | |||
| 18 | util/rblist.c | 18 | util/rblist.c |
| 19 | util/strlist.c | 19 | util/strlist.c |
| 20 | util/fs.c | 20 | util/fs.c |
| 21 | util/trace-event.c | ||
| 21 | ../../lib/rbtree.c | 22 | ../../lib/rbtree.c |