Merge branch 'tracing/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...
Ingo Molnar [Tue, 4 Aug 2009 11:58:28 +0000 (13:58 +0200)]
1  2 
kernel/trace/trace.c

Simple merge