Merge branch 'timers/core'

author Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/kernel/time.c
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc kernel/hrtimer.c
Simple merge
diff --cc kernel/posix-cpu-timers.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:39 +0000 (08:45 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/time.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/hrtimer.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/posix-cpu-timers.c	patch \|	diff1 \|	diff2 \|	blob \| history