Merge branch 'x86/fpu'

diff --cc arch/x86/kernel/i387.c
Simple merge

diff --cc arch/x86/kernel/process.c
Simple merge

diff --cc arch/x86/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge