]> 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)
commit6b3dcd16bf4904a2e52a3d6a38a6e216b17627f8
tree45fd2b64247cd44201fe519720494d4bf01b7014
parent7f3b691f62822cb669b480ad07bb082d2b59777a
parent1163045266bee46e48b27f1a017d8df658115920
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