| commit | 29d03fa12bc02c0f8085cd6bb06d11359a4bccaf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 28 10:16:27 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 28 10:16:27 2010 -0700 |
| tree | 0810a1b2bad0f853b270afed55eddc595ae8d2fc | |
| parent | 89ad6a6173127e5d31bea7a4a45ec23fa5bf4a17 [diff] | |
| parent | 45e0fffc8a7778282e6a1514a6ae3e7ae6545111 [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