Merge tag 'v4.0-rc1' into perf/core, to refresh the tree

author Ingo Molnar <[email protected]>

Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)

committer Ingo Molnar <[email protected]>

Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
author Ingo Molnar <[email protected]>
Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
committer Ingo Molnar <[email protected]>
Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
diff --cc include/linux/perf_event.h
Simple merge
diff --cc kernel/events/core.c
Simple merge
diff --cc tools/lib/lockdep/Makefile
Simple merge
author	Ingo Molnar <[email protected]>
	Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
committer	Ingo Molnar <[email protected]>
	Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
		1	2
include/linux/perf_event.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/lib/lockdep/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history