Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
"Misc fixes: a Geode fix plus a microcode loader fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode/intel: Clear patch pointer before jettisoning the initrd
x86/cpu/cyrix: Add alternative Device ID of Geode GX1 SoC

+4
+1
arch/x86/kernel/cpu/cyrix.c
··· 255 255 break; 256 256 257 257 case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */ 258 + case 11: /* GX1 with inverted Device ID */ 258 259 #ifdef CONFIG_PCI 259 260 { 260 261 u32 vendor, device;
+3
arch/x86/kernel/cpu/microcode/intel.c
··· 619 619 620 620 show_saved_mc(); 621 621 622 + /* initrd is going away, clear patch ptr. */ 623 + intel_ucode_patch = NULL; 624 + 622 625 return 0; 623 626 } 624 627