]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1e00ffa6d0730e8f6361e9f26e1e141081b5b5d6
tree06204f2452e02ca916666173d50f5035d69065ef
parentbe0bfcf2ba82dbe96667697bcdb1285867dad42f
parent4ebc98768a0aaca5d6b21484761187c08cb872ed
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