Merge branch 'x86/fpu'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
index 3b78d59e41259977a7156d631ab47ebee5cd0793,b0fe078614d88713a86e0dff75eb23870e6b7495..e3f05ad7c9be51a040991ed69bccc4b1c837ec76
--- 1/arch/x86/kernel/cpu/common.c
--- 2/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1294,8 -1297,9 +1294,7 @@@ void __cpuinit cpu_init(void
        dbg_restore_debug_regs();
  
        fpu_init();
-       xsave_init();
  
 -      raw_local_save_flags(kernel_eflags);
 -
        if (is_uv_system())
                uv_cpu_init();
  }

diff --cc arch/x86/kvm/x86.c
Simple merge