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)
commit4bcc7827b02feea2c762fa6d46a1bffb300d7403
tree45fd2b64247cd44201fe519720494d4bf01b7014
parent3f705dfdf85a6416f5f12e52b7610144a99cbedc
parentf22e6e847115abc3a0e2ad7bb18d243d42275af1
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