]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b4d0ba 2106b53)
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)
* '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

1  2 
kernel/posix-timers.c patch | diff1 | diff2 | blob | history
kernel/signal.c patch | diff1 | diff2 | blob | history

diff --cc kernel/posix-timers.c
Simple merge
diff --cc kernel/signal.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.