diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 12:14:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-28 12:14:48 (GMT) |
| commit | 8237eb946a1a23c600fb289cf8dd3b399b10604e (patch) | |
| tree | e3985782029601ede4035cfec7ee59e1a54324fd /arch/alpha/oprofile | |
| parent | cc21fe518a971bb2b0ab8370ec46ea21e84c57ab (diff) | |
| parent | bcb80e53877c2045d9e52f4a71372c3fe6501f6f (diff) | |
| download | linux-8237eb946a1a23c600fb289cf8dd3b399b10604e.tar.xz | |
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode, AMD: Add microcode revision to /proc/cpuinfo
x86, microcode: Correct microcode revision format
coretemp: Get microcode revision from cpu_data
x86, intel: Use c->microcode for Atom errata check
x86, intel: Output microcode revision in /proc/cpuinfo
x86, microcode: Don't request microcode from userspace unnecessarily
Fix up trivial conflicts in arch/x86/kernel/cpu/amd.c (conflict between
moving AMD BSP code to cpu_dev helper function and adding AMD microcode
revision to /proc/cpuinfo code)
Diffstat (limited to 'arch/alpha/oprofile')
0 files changed, 0 insertions, 0 deletions