| commit | 7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 17 12:26:37 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 17 12:26:37 2018 -0800 |
| tree | f960ab20ee3b3aadbef0eee95da85375da6c6d04 | |
| parent | b8c22594b1c4c830c391dbf2e07afc14aca10460 [diff] | |
| parent | 1289e0e29857e606a70a0200bf7849ae38d3493a [diff] |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 perf fix from Ingo Molnar: "An Intel RAPL events fix" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/rapl: Fix Haswell and Broadwell server RAPL event