Merge branch 'locking/nmi' into locking/core, to pick up completed topic branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>