| commit | 2cc538412a1ca103923ec400a339a5b3833e0280 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Sep 05 12:09:59 2016 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Sep 05 12:09:59 2016 +0200 |
| tree | c141b83e1da736c3d069ed491816d0096e1b532a | |
| parent | 36e674a05164cdbb9d4a5b1b0b279fabae6c13bd [diff] | |
| parent | 58763148758057ffc447bf990321d3ea86d199a0 [diff] |
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>