diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-12 14:46:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-12 14:46:14 -0700 |
| commit | fcb45a28489c981bcdab510a838fcac5c21c07e2 (patch) | |
| tree | 773f81c837b86ccaad9333a63ededfc51cd10545 /crypto/jitterentropy.c | |
| parent | e9ec3588a9372dfb9b04afcddb199ad9e2be0044 (diff) | |
| parent | 8d7c6ac3b2371eb1cbc9925a88f4d10efff374de (diff) | |
| download | linux-fcb45a28489c981bcdab510a838fcac5c21c07e2.tar.gz linux-fcb45a28489c981bcdab510a838fcac5c21c07e2.tar.bz2 linux-fcb45a28489c981bcdab510a838fcac5c21c07e2.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A handful of fixes: a kexec linking fix, an AMD MWAITX fix, a vmware
guest support fix when built under Clang, and new CPU model number
definitions"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpu: Add Comet Lake to the Intel CPU models header
lib/string: Make memzero_explicit() inline instead of external
x86/cpu/vmware: Use the full form of INL in VMWARE_PORT
x86/asm: Fix MWAITX C-state hint value
Diffstat (limited to 'crypto/jitterentropy.c')
0 files changed, 0 insertions, 0 deletions