Merge tag 'v4.0-rc1' into perf/core, to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
committerIngo Molnar <mingo@kernel.org>
Thu, 26 Feb 2015 11:24:50 +0000 (12:24 +0100)
commite9e4e44309f866b115d08ab4a54834008c50a8a4
treeae9f91e682a4d6592ef263f30a4a0b1a862b7987
parent8a26ce4e544659256349551283414df504889a59
parentc517d838eb7d07bbe9507871fab3931deccff539
Merge tag 'v4.0-rc1' into perf/core, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/perf_event.h
kernel/events/core.c
tools/lib/lockdep/Makefile