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)
commit72b623c73685e86b70a51855e1058ebc98a9f6ed
treece0942ca907ad09480358076fd2724f8c1d10547
parent9abd60304816a5b0fd9e51034f78e3eaed89f901
parentb5f9fd0f8a05c9bafb91a9a85b9110938d8e585b
Merge branch 'tip/tracing/ftrace' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/power-tracer
arch/x86/kernel/process.c