Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 10:13:15 +0000 (11:13 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 23 Mar 2015 10:13:15 +0000 (11:13 +0100)
commite4518ab90f63cd5bea3ddc15341162debc34442b
treefcefaeced9562de840bbf11ec2ffc95e1d9a571f
parentc56716af8d27ca8dd6e45445ae1c0a05fd9753a6
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6
Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts

Conflicts:
arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/traps.c