Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits
authorIngo Molnar <mingo@kernel.org>
Fri, 12 Dec 2014 08:09:03 +0000 (09:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 12 Dec 2014 08:09:03 +0000 (09:09 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c

Simple merge