Merge remote-tracking branch 'tip/auto-latest'

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

Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)

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

Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc include/linux/perf_event.h
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/fork.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:16:06 +0000 (14:16 +1100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	patch \|	diff1 \|	diff2 \|	blob \| history