Pull ia64-clocksource into release branch

author Tony Luck <tony.luck@intel.com>

Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)

committer Tony Luck <tony.luck@intel.com>

Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)
author Tony Luck <tony.luck@intel.com>
Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)
committer Tony Luck <tony.luck@intel.com>
Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)
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
author	Tony Luck <tony.luck@intel.com>
	Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)
committer	Tony Luck <tony.luck@intel.com>
	Fri, 20 Jul 2007 18:26:47 +0000 (11:26 -0700)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/configs/tiger_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/ia64/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	patch \|	diff1 \|	diff2 \|	blob \| history