Pull ia64-clocksource into release branch
Tony Luck [Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)]
1  2 
Documentation/kernel-parameters.txt
arch/ia64/configs/tiger_defconfig
arch/ia64/defconfig
kernel/time/timekeeping.c
kernel/timer.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/timer.c
Simple merge