Merge branch 'perf/urgent' into perf/core, to pick up fixed and resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 5 Sep 2016 10:09:59 +0000 (12:09 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 5 Sep 2016 10:09:59 +0000 (12:09 +0200)
commit2cc538412a1ca103923ec400a339a5b3833e0280
treec141b83e1da736c3d069ed491816d0096e1b532a
parent36e674a05164cdbb9d4a5b1b0b279fabae6c13bd
parent58763148758057ffc447bf990321d3ea86d199a0
Merge branch 'perf/urgent' into perf/core, to pick up fixed and resolve conflicts

 Conflicts:
kernel/events/core.c

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