Merge branch 'fortglx/3.3/tip/timers/core' of git://git.linaro.org/people/jstultz...
Thomas Gleixner [Mon, 5 Dec 2011 21:13:49 +0000 (22:13 +0100)]
1  2 
arch/x86/kernel/tsc.c
kernel/time/timekeeping.c

Simple merge
Simple merge