Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 09:13:36 +0000 (10:13 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 09:13:36 +0000 (10:13 +0100)
commiteda2360ad18b7cde87728fad85c6735a52c2576e
tree2bc28704b40686c0d3d0fd5aa7d000f9d9dd153f
parent1d23c4518b1f3a03c278f23333149245c178d2a6
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6
Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/fpu-internal.h
arch/x86/kernel/i387.c
arch/x86/kernel/process.c
arch/x86/kernel/traps.c
arch/x86/kernel/xsave.c