]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitef26826b65cd55f6391d654798ca5dcbbe05bfb5
treefcefaeced9562de840bbf11ec2ffc95e1d9a571f
parent587cdb05629bf40e245318eb4c6939177ddf6615
parent3409255769c2683ef21d8fb2452cc5bbd994ca29
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