diff options
| author | Linus Torvalds | 2016-08-18 15:09:41 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-18 15:09:41 -0700 |
| commit | 3408fef7448ce7d3c926978ee1a511e7707bffba (patch) | |
| tree | 2be7753e317499860665de00442982a4dcf1b28c /fs/ocfs2 | |
| parent | b061b4f36d2fce94a866e41c68bea782a5673461 (diff) | |
| parent | 7b0501b1e7cddd32b265178e32d332bdfbb532d4 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"An initrd microcode loading fix, and an SMP bootup topology setup fix
to resolve crashes on SGI/UV systems if the BIOS is configured in a
certain way"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/smp: Fix __max_logical_packages value setup
x86/microcode/AMD: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions