diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-24 09:21:14 +0100 |
| commit | 5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0 (patch) | |
| tree | b35db1791ac7acaba54eb3aa9f751790b735428d /kernel | |
| parent | ecd380b8dead1bad67e3af87e2ddfe826c3da79d (diff) | |
| parent | 2c2a9bbe7fecb2ad4981b6f4a56cacbfb849f848 (diff) | |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Pick up a cherry-picked commit.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions