Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 21 May 2010 15:53:06 +0000 (17:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 21 May 2010 15:53:46 +0000 (17:53 +0200)
commitf80836c86ebd44bf8f90882283a1618e09dfaed2
treebe28455ff20df71fcebc3e59b2575721ab099ba3
parent598357eba6a55d27ddc7ead80ebb83fe1aad9b83
parentff5f149b6aec8edbfa3698721667acd043009a33
Merge branch 'tip/tracing/core-7' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core