From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 00:44:40 +0000 (-0700)
Subject: Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e6628e4bcb3b3546c625ec63ca724f28ab14f0c;p=linux-beck.git

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

* 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: hpet: Cleanup the clockevents init and register code
  x86: Convert PIT to clockevents_config_and_register()
  clockevents: Provide interface to reconfigure an active clock event device
  clockevents: Provide combined configure and register function
  clockevents: Restructure clock_event_device members
  clocksource: Get rid of the hardcoded 5 seconds sleep time limit
  clocksource: Restructure clocksource struct members
---

7e6628e4bcb3b3546c625ec63ca724f28ab14f0c