Conflicts: tools/perf/bench/numa.c Pull perf fixes from Jiri Olsa. Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
|---|---|---|
| .. | ||
| feature-checks | ||
| Makefile | ||
| Makefile.arch | ||
| utilities.mak | ||
Conflicts: tools/perf/bench/numa.c Pull perf fixes from Jiri Olsa. Signed-off-by: Ingo Molnar <mingo@kernel.org> |
||
|---|---|---|
| .. | ||
| feature-checks | ||
| Makefile | ||
| Makefile.arch | ||
| utilities.mak | ||