Merge branch 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 09:17:13 +0000 (11:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 7 May 2009 09:17:34 +0000 (11:17 +0200)
commit44347d947f628060b92449702071bfe1d31dfb75
treec6ed74610d5b3295df4296659f80f5feb94b28cc
parentd94fc523f3c35bd8013f04827e94756cbc0212f4
parent413f81eba35d6ede9289b0c8a920c013a84fac71
Merge branch 'linus' into tracing/core

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:
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