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)
commit45b86a96f17cb2900f291129b0e67287400e45b2
treef7968bf36e3947ee42251f7eebc6ea5f24aca202
parent072ba49838b42c873c496d72c91bb237914cf3b6
parent4143c5cb36331155a1823af8b3a8c761a59fed71
Merge branch 'devel' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
kernel/trace/trace.c