]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 8 Apr 2015 07:01:54 +0000 (09:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 8 Apr 2015 07:01:54 +0000 (09:01 +0200)
commit71efdda2e83804e239e543a841bb6e9651ebe188
tree45fd2b64247cd44201fe519720494d4bf01b7014
parentc239548210d73bf8c6c14eefcdf4aef479638ec5
parent67eb51d624ce0c0c910eddcb2cbdef244bcb204f
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts

Conflicts:
arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/entry_64.S
arch/x86/kernel/kgdb.c
tools/testing/selftests/Makefile