Merge branch 'x86/fpu' into x86/cleanups