]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
authorIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:16:20 +0000 (09:16 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Nov 2008 08:16:20 +0000 (09:16 +0100)
1  2 
kernel/trace/trace.c

Simple merge