diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /tools/perf/util/python-ext-sources | |
parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'tools/perf/util/python-ext-sources')
-rw-r--r-- | tools/perf/util/python-ext-sources | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/python-ext-sources b/tools/perf/util/python-ext-sources index 2884e67ee625..213362850abd 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources | |||
@@ -10,10 +10,12 @@ util/ctype.c | |||
10 | util/evlist.c | 10 | util/evlist.c |
11 | util/evsel.c | 11 | util/evsel.c |
12 | util/cpumap.c | 12 | util/cpumap.c |
13 | util/hweight.c | ||
13 | util/thread_map.c | 14 | util/thread_map.c |
14 | util/util.c | 15 | util/util.c |
15 | util/xyarray.c | 16 | util/xyarray.c |
16 | util/cgroup.c | 17 | util/cgroup.c |
17 | util/debugfs.c | 18 | util/debugfs.c |
19 | util/rblist.c | ||
18 | util/strlist.c | 20 | util/strlist.c |
19 | ../../lib/rbtree.c | 21 | ../../lib/rbtree.c |