diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:51:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-02 09:51:41 +0200 |
| commit | a4c9f26533eb547c8123e9a5f77517f61d19d2c2 (patch) | |
| tree | 9767715779be7314ea86b1a83ae96f72e5ddb0da /drivers/idle/intel_idle.c | |
| parent | Merge branch 'perf/urgent' into perf/core, to pick up fixes (diff) | |
| parent | x86/intel_rdt: Use perf infrastructure for measurements (diff) | |
| download | wireguard-linux-a4c9f26533eb547c8123e9a5f77517f61d19d2c2.tar.xz wireguard-linux-a4c9f26533eb547c8123e9a5f77517f61d19d2c2.zip | |
Merge branch 'x86/cache' into perf/core, to resolve conflicts
Avoid conflict with upcoming perf/core patches, merge in the RDT perf work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/idle/intel_idle.c')
0 files changed, 0 insertions, 0 deletions