]> 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)
commitdd78d0f4d74809977e4bbf37c7a82cd221806b98
treefcefaeced9562de840bbf11ec2ffc95e1d9a571f
parentb909965cfe9ab0c341593f0d0393ba42d1a4feca
parent975c89e4da24c0f77ce71944d00208b9186fb10d
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