Merge branch 'trace/ftrace/arm64' into trace/for-next

author Steven Rostedt <rostedt@goodmis.org>

Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)

committer Steven Rostedt <rostedt@goodmis.org>

Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)
author Steven Rostedt <rostedt@goodmis.org>
Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)
committer Steven Rostedt <rostedt@goodmis.org>
Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/ftrace.h
Simple merge
diff --cc kernel/trace/ftrace.c
Simple merge
author	Steven Rostedt <rostedt@goodmis.org>
	Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)
committer	Steven Rostedt <rostedt@goodmis.org>
	Thu, 22 May 2014 02:02:38 +0000 (22:02 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/ftrace.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/ftrace.c	patch \|	diff1 \|	diff2 \|	blob \| history