tree b4d70c6a305d91bf7d1c8a6bbf87508587d55633
parent 80fe02b5daf176f99d3afc8f6c9dc9dece019836
parent a18f22a968de17b29f2310cdb7ba69163e65ec15
author Linus Torvalds <torvalds@linux-foundation.org> 1305852253 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305852253 -0700

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

* '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