OSDN Git Service

Merge branch 'locking/core' into x86/core, to prepare for dependent patch
authorIngo Molnar <mingo@kernel.org>
Wed, 3 Jun 2015 08:07:35 +0000 (10:07 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 3 Jun 2015 08:07:35 +0000 (10:07 +0200)
commit71966f3a0b24b408a87a0c475262638fbb71da99
treece900472dd12f03fd6d0e764ea9f5a647471689d
parent34e7724c0767f04f6199f2bd7232e9ab1207e1df
parent92ae18371cb1abb4e186dd9d48de2bb0d9bba626
Merge branch 'locking/core' into x86/core, to prepare for dependent patch

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/include/asm/paravirt_types.h
arch/x86/kernel/paravirt_patch_64.c
kernel/locking/rtmutex.c