diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 02:46:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-23 02:46:14 +0200 |
commit | 35ffccdb7e014a88c58e3161b36fe8890f5bab7b (patch) | |
tree | f4426a656c74b660e95e4e0f70db4770de591cb6 /arch/x86/include/asm/hpet.h | |
parent | Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | x86/microcode: Correct CPU family related variable types (diff) | |
download | linux-35ffccdb7e014a88c58e3161b36fe8890f5bab7b.tar.xz linux-35ffccdb7e014a88c58e3161b36fe8890f5bab7b.zip |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pul x86 microcode updates from Ingo Molnar:
"x86 microcode loader updates from Borislav Petkov:
- early parsing of the built-in microcode
- cleanups
- misc smaller fixes"
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode: Correct CPU family related variable types
x86/microcode: Disable builtin microcode loading on 32-bit for now
x86/microcode/intel: Rename get_matching_sig()
x86/microcode/intel: Simplify get_matching_sig()
x86/microcode/intel: Simplify update_match_cpu()
x86/microcode/intel: Rename get_matching_microcode
x86/cpu/microcode: Zap changelog
x86/microcode: Parse built-in microcode early
x86/microcode/intel: Remove unused @rev arg of get_matching_sig()
x86/microcode/intel: Get rid of revision_is_newer()
Diffstat (limited to 'arch/x86/include/asm/hpet.h')
0 files changed, 0 insertions, 0 deletions