Merge branch 'core/locking2'

author Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)
diff --cc kernel/futex.c
Simple merge
diff --cc kernel/time/ntp.c
Simple merge
diff --cc kernel/watchdog.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:48:35 +0000 (08:48 +0100)
		1	2
kernel/futex.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/ntp.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/watchdog.c	patch \|	diff1 \|	diff2 \|	blob \| history