Merge remote-tracking branch 'rcu/rcu/next'

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

Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)

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

Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)
diff --cc include/linux/ftrace_event.h
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/time/Kconfig
Simple merge
diff --cc kernel/trace/trace.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 22 Aug 2013 04:26:35 +0000 (14:26 +1000)
		1	2
include/linux/ftrace_event.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	patch \|	diff1 \|	diff2 \|	blob \| history