commit | f80836c86ebd44bf8f90882283a1618e09dfaed2 | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@elte.hu> | Fri May 21 17:53:06 2010 +0200 |
committer | Ingo Molnar <mingo@elte.hu> | Fri May 21 17:53:46 2010 +0200 |
tree | be28455ff20df71fcebc3e59b2575721ab099ba3 | |
parent | 598357eba6a55d27ddc7ead80ebb83fe1aad9b83 [diff] | |
parent | ff5f149b6aec8edbfa3698721667acd043009a33 [diff] |
Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core