Pull ia64-clocksource into release branch

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/ia64/configs/tiger_defconfig
Simple merge

diff --cc arch/ia64/defconfig
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge

diff --cc kernel/timer.c
Simple merge