| commit | 0b20e59cef927b030c2e626f40fc4965bacec847 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Apr 28 10:35:17 2016 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Apr 28 10:35:17 2016 +0200 |
| tree | c090a7a4e2c20065eb5825debff1a724a7775b8a | |
| 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>