| commit | af390084359a5de20046c901529b2b6a50b941cb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 13:12:36 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 06 13:12:36 2010 -0700 |
| tree | b73a6261d1b1f9fb34432cc9a47411a49330b8dc | |
| parent | 7645e4320497b35ce9fb6c2269ebcd57af9fe735 [diff] | |
| parent | 0fcb80818bc3ade5befd409051089f710adcf7b0 [diff] |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/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