]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:00:50 +0000 (09:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:00:50 +0000 (09:00 +0100)
1  2 
kernel/trace/ftrace.c

Simple merge