Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit78c4def67e8eebe602655a3dec9aa08f0e2f7c4b
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 00:45:08 +0000 (19 17:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 May 2011 00:45:08 +0000 (19 17:45 -0700)
tree8c0c756bbff7325f5c2a773f8cc64d8390ebe5b5
parent7e6628e4bcb3b3546c625ec63ca724f28ab14f0c
parent942c3c5c329274fa6de5998cb911cf3d0a42d0b1
Merge branch 'timers-core-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  hrtimer: Make lookup table const
  RTC: Disable CONFIG_RTC_CLASS from being built as a module
  timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS=n
  timers: Remove delayed irqwork from alarmtimers implementation
  timers: Improve alarmtimer comments and minor fixes
  timers: Posix interface for alarm-timers
  timers: Introduce in-kernel alarm-timer interface
  timers: Add rb_init_node() to allow for stack allocated rb nodes
  time: Add timekeeping_inject_sleeptime
include/linux/capability.h