]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:43:03 +0000 (20:43 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 15 Feb 2009 19:43:03 +0000 (20:43 +0100)
1  2 
arch/x86/kernel/process.c

Simple merge