Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
authorIngo Molnar <mingo@kernel.org>
Wed, 6 Dec 2017 21:39:39 +0000 (22:39 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Dec 2017 21:39:39 +0000 (22:39 +0100)
commitd6eabce2577a695197e9433302fd6a9f0e1a7666
treee5c5bcc7803879d5d911cc8faeb74a946c242395
parent6e948c67c47211afcc65c9ccdeedbd5db5c57077
parent328b4ed93b69a6f2083d52f31a240a09e5de386a
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers

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