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)
Conflicts:
arch/x86/kernel/entry_64.S

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

Simple merge