Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Aug 2008 23:46:11 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Aug 2008 23:46:11 +0000 (16:46 -0700)
commit67a077dca4e648a662e32cbeaaba8094d2e30229
tree2f8943838b73b0a8ea590b1aaad9294eb280ea1e
parent9b4d0bab32e18e4f72781f9fa309a81495b2aff3
parent2106b531eaa2edd0c2dfa735a0556c08c7ba3c86
Merge branch 'timers-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  posix-timers: fix posix_timer_event() vs dequeue_signal() race
  posix-timers: do_schedule_next_timer: fix the setting of ->si_overrun
kernel/posix-timers.c
kernel/signal.c