Merge remote-tracking branch 'ftrace/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/entry_64.S
Simple merge
diff --cc include/linux/ftrace.h
Simple merge
diff --cc include/linux/kprobes.h
Simple merge
diff --cc kernel/trace/ftrace.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 16 May 2014 03:59:35 +0000 (13:59 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/kprobes.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	patch \|	diff1 \|	diff2 \|	blob \| history