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>

diff --cc Documentation/DocBook/Makefile
Simple merge

diff --cc arch/x86/include/asm/tlbflush.h
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/mm/kmmio.c
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-sysfs.c
Simple merge

diff --cc drivers/md/dm.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/init_task.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/irq/handle.c
Simple merge

diff --cc kernel/lockdep.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/softirq.c
Simple merge

diff --cc kernel/trace/trace_branch.c
Simple merge

diff --cc kernel/trace/trace_power.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc scripts/kernel-doc
Simple merge