diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-29 01:11:24 -0500 |
| commit | 4fc31ba13d052c2933bf91095c063cf9a39effd0 (patch) | |
| tree | beabb73c2fe245e6541126732895da62e55bc8ee /tools/perf/util/python-ext-sources | |
| parent | 0e18dd12064e07519f7cbff4149ca7fff620cbed (diff) | |
| parent | b29c6ef7bb1257853c1e31616d84f55e561cf631 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
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 e66dc495809a..b4f2f06722a7 100644 --- a/tools/perf/util/python-ext-sources +++ b/tools/perf/util/python-ext-sources | |||
| @@ -10,6 +10,7 @@ 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/mmap.c | ||
| 13 | util/namespaces.c | 14 | util/namespaces.c |
| 14 | ../lib/bitmap.c | 15 | ../lib/bitmap.c |
| 15 | ../lib/find_bit.c | 16 | ../lib/find_bit.c |