Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 20:12:36 +0000 (13:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 20:12:36 +0000 (13:12 -0700)
commitaf390084359a5de20046c901529b2b6a50b941cb
treeb73a6261d1b1f9fb34432cc9a47411a49330b8dc
parent7645e4320497b35ce9fb6c2269ebcd57af9fe735
parent0fcb80818bc3ade5befd409051089f710adcf7b0
Merge branch 'timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Documentation: Add timers/timers-howto.txt
  timer: Added usleep_range timer
  Revert "timer: Added usleep[_range] timer"
  clockevents: Remove the per cpu tick skew
  posix_timer: Move copy_to_user(created_timer_id) down in timer_create()
  timer: Added usleep[_range] timer
  timers: Document meaning of deferrable timer
kernel/time/tick-sched.c
kernel/timer.c