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)
commit3459f0d78ffe27a1b341c22eb158b622eaaea3fc
tree715b0575eec541d0181876ad367ca5480cdcecf3
parent9fc81d87420d0d3fd62d5e5529972c0ad9eab9cc
parentbee2782f30f66898be3f74ad02e4d1f87a969694
Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/events/core.c