Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 7 Jan 2010 09:26:22 +0000 (10:26 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 Jan 2010 09:26:22 +0000 (10:26 +0100)
commitff2576674c19c4b74acc4f6cc9bac3b94916350b
tree01f648599bfeed726f25c337b695129c4222b32f
parent2c1f1895ef2aa8f0e5497893eff71304aef332e1
parent0e1ff5d72a6393f2ef5dbf74f58bb55a12d63834
Merge branch 'tip/tracing/urgent' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent