diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-17 23:26:37 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-17 23:26:37 +0300 |
commit | 7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3 (patch) | |
tree | f960ab20ee3b3aadbef0eee95da85375da6c6d04 /arch/powerpc/include/asm/emergency-restart.h | |
parent | b8c22594b1c4c830c391dbf2e07afc14aca10460 (diff) | |
parent | 1289e0e29857e606a70a0200bf7849ae38d3493a (diff) | |
download | linux-7dfda84d1699c2ae2fbd82f3ce611af2ed7b18b3.tar.xz |
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
Diffstat (limited to 'arch/powerpc/include/asm/emergency-restart.h')
0 files changed, 0 insertions, 0 deletions