Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux...
commit7e6628e4bcb3b3546c625ec63ca724f28ab14f0c
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 00:44:40 +0000 (19 17:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 00:44:40 +0000 (19 17:44 -0700)
tree111a94cefa9d800ec5c5e59520f4b5d1880965d0
parent0f1bdc1815c4cb29b3cd71a7091b478e426faa0b
parentab0e08f15d23628dd8d50bf6ce1a935a8840c7dc
Merge branch 'timers-clockevents-for-linus' of git://git./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
kernel/time/clocksource.c