]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 89ad6a6 45e0fff)
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 17:16:27 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 May 2010 17:16:27 +0000 (10:16 -0700)
commit29d03fa12bc02c0f8085cd6bb06d11359a4bccaf
tree0810a1b2bad0f853b270afed55eddc595ae8d2fctree | snapshot
parent89ad6a6173127e5d31bea7a4a45ec23fa5bf4a17commit | diff
parent45e0fffc8a7778282e6a1514a6ae3e7ae6545111commit | diff
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/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_timer: Fix error path in timer_create
  hrtimer: Avoid double seqlock
  timers: Move local variable into else section
  timers: Fix slack calculation really
kernel/timer.c diff1 | diff2 | blob | history
Michael's Linux tree.