]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6dc0e2db9af919dd37ba5433cfa9ee3750f825b8
tree0810a1b2bad0f853b270afed55eddc595ae8d2fc
parent4b900b1a05e93da6b16a59329b6ed834d6a5bb43
parentc34df12d3a83c69d2227822bd7200d4f47e9fea7
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