Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz...

author Thomas Gleixner <tglx@linutronix.de>

Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)

committer Thomas Gleixner <tglx@linutronix.de>

Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
author Thomas Gleixner <tglx@linutronix.de>
Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
committer Thomas Gleixner <tglx@linutronix.de>
Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
diff --cc arch/x86/kernel/tsc.c
Simple merge
diff --cc kernel/time/timekeeping.c
Simple merge
author	Thomas Gleixner <tglx@linutronix.de>
	Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
committer	Thomas Gleixner <tglx@linutronix.de>
	Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)
		1	2
arch/x86/kernel/tsc.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	patch \|	diff1 \|	diff2 \|	blob \| history