| commit | af07ce3e77d3b24ab1d71fcc5833d41800f23b2b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Jun 16 13:26:23 2011 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Jun 16 13:26:23 2011 +0200 |
| tree | f464a6df26e0b62ba23c22de954cd58fb9a59aaa | |
| parent | b4f9f2b64aa189c5584f266f4f0343af7a705441 [diff] | |
| parent | 0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a [diff] |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core Conflicts: Makefile