Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 17 Sep 2009 18:52:23 +0000 (20:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Sep 2009 18:53:10 +0000 (20:53 +0200)
commit45bd00d31de886f8425b4dd33204b911b0a466a9
tree06204f2452e02ca916666173d50f5035d69065ef
parent40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01
parentab86e5765d41a5eb4239a1c04d613db87bea5ed8
Merge branch 'linus' into tracing/core

Merge reason: Pick up kernel/softirq.c update for dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/trace/events.txt
MAINTAINERS
include/asm-generic/vmlinux.lds.h
kernel/trace/trace_events.c