diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:12:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-06 16:12:36 -0400 |
commit | af390084359a5de20046c901529b2b6a50b941cb (patch) | |
tree | b73a6261d1b1f9fb34432cc9a47411a49330b8dc /arch/parisc/kernel/pci-dma.c | |
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
Diffstat (limited to 'arch/parisc/kernel/pci-dma.c')
0 files changed, 0 insertions, 0 deletions