Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
commit6d5b43a67accf6793ed259f6534b4bd53b1e5696
authorIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:00:50 +0000 (19 09:00 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:00:50 +0000 (19 09:00 +0100)
treeb22f2b7dc929b523faf63d2734d8b22b5fd4a843
parent641d2f63cfe24539e154efa2f932937934c27dde
parent32464779a1b8c15e9aa9aa0306b2f735080df9d8
Merge branch 'tip/urgent' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
kernel/trace/ftrace.c