diff options
| author | Linus Torvalds <[email protected]> | 2013-08-19 16:18:29 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-08-19 16:18:29 +0000 |
| commit | 7067552dfb382cef040326ab6dd0b8d642af3e64 (patch) | |
| tree | f09ff2a949007da4a976e37cbad43490a0904f81 /fs/btrfs/dev-replace.c | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Merge tag 'amd_ucode_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-7067552dfb382cef040326ab6dd0b8d642af3e64.tar.gz kernel-7067552dfb382cef040326ab6dd0b8d642af3e64.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:
"Two AMD microcode loader fixes and an OLPC firmware support fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, microcode, AMD: Fix early microcode loading
x86, microcode, AMD: Make cpu_has_amd_erratum() use the correct struct cpuinfo_x86
x86: Don't clear olpc_ofw_header when sentinel is detected
Diffstat (limited to 'fs/btrfs/dev-replace.c')
0 files changed, 0 insertions, 0 deletions