From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 00:44:13 +0000 (-0700)
Subject: Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f1bdc1815c4cb29b3cd71a7091b478e426faa0b;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'timers-clocksource-for-linus' of git://git./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
---

0f1bdc1815c4cb29b3cd71a7091b478e426faa0b