| commit | 51887c8230d57c4d9cc68e3784c52c8f0a708655 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Aug 18 21:58:46 2011 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Aug 18 21:58:46 2011 +0200 |
| tree | 70509225468cddacb24eccdc78c7d8fc9e0197c5 | |
| parent | 8bc84f87315e8bdbe242ba788fdc6a74d653b177 [diff] | |
| parent | 4aa9015f8bfd2c8d7cc33a360275b71a9d708b37 [diff] |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core Conflicts: tools/perf/builtin-stat.c