Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux...

* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: convert mips to generic i8253 clocksource
  clocksource: convert x86 to generic i8253 clocksource
  clocksource: convert footbridge to generic i8253 clocksource
  clocksource: add common i8253 PIT clocksource
  blackfin: convert to clocksource_register_hz
  mips: convert to clocksource_register_hz/khz
  sparc: convert to clocksource_register_hz/khz
  alpha: convert to clocksource_register_hz
  microblaze: convert to clocksource_register_hz/khz
  ia64: convert to clocksource_register_hz/khz
  x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
  Make clocksource name const

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/jz4740/time.c
Simple merge

diff --cc arch/mips/sgi-ip27/ip27-timer.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/lguest/boot.c
Simple merge

diff --cc arch/x86/xen/time.c
Simple merge