diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-28 10:35:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-28 10:35:17 +0200 |
| commit | 0b20e59cef927b030c2e626f40fc4965bacec847 (patch) | |
| tree | c090a7a4e2c20065eb5825debff1a724a7775b8a /drivers/powercap | |
| parent | a8944c5bf86dc6c153a71f2a386738c0d3f5ff9c (diff) | |
| parent | cf3beb7c90a8efa16a06b26634cddddc92bb819c (diff) | |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Conflicts:
arch/x86/events/intel/pt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/powercap')
0 files changed, 0 insertions, 0 deletions