Merge branch 'linus' into tracing/core
Ingo Molnar [Thu, 7 May 2009 09:17:13 +0000 (11:17 +0200)]
Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

20 files changed:
1  2 
Documentation/DocBook/Makefile
arch/x86/include/asm/tlbflush.h
arch/x86/kernel/entry_64.S
arch/x86/mm/kmmio.c
block/blk-core.c
block/blk-sysfs.c
drivers/md/dm.c
drivers/scsi/sg.c
include/asm-generic/vmlinux.lds.h
include/linux/init_task.h
init/main.c
kernel/irq/handle.c
kernel/lockdep.c
kernel/sched.c
kernel/softirq.c
kernel/trace/trace_branch.c
kernel/trace/trace_power.c
mm/util.c
net/core/skbuff.c
scripts/kernel-doc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/dm.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/util.c
Simple merge
Simple merge
Simple merge