| commit | f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Dec 08 15:25:06 2012 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Dec 08 15:25:06 2012 +0100 |
| tree | 7800081c5cb16a4dfee1e57a70f3be90f7b50d9a | |
| parent | adc1ef1e37358d3c17d1a74a58b2e104fc0bda15 [diff] | |
| parent | 1b3c393cd43f22ead8a6a2f839efc6df8ebd7465 [diff] |
Merge branch 'linus' into perf/core Conflicts: tools/perf/Makefile tools/perf/builtin-test.c tools/perf/perf.h tools/perf/tests/parse-events.c tools/perf/util/evsel.h Signed-off-by: Ingo Molnar <mingo@kernel.org>