| commit | 83bc90e11576f9c100f8ef4ba2bcd0b89212e3fb | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Aug 24 22:32:24 2014 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Aug 24 22:32:24 2014 +0200 |
| tree | e59186b4d315c80255851e0d204143ecc21399a0 | |
| parent | e21ded5ecc531a64d6fc0c1693285e890b4e9569 [diff] | |
| parent | 451fd72219dd6f3355e2d036c598544c760ee532 [diff] |
Merge branch 'linus' into perf/core, to fix conflicts Conflicts: arch/x86/kernel/cpu/perf_event_intel_uncore*.c Signed-off-by: Ingo Molnar <mingo@kernel.org>