| commit | 29a0c5ce5d008f398346d644456d62ab300d5e10 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:29:42 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:29:42 2009 -0800 |
| tree | f549f6c78905f318f0e6342edede01cb7c0561b9 | |
| parent | f8effd1a4a1833eac90261d78abacfaefe3d99e4 [diff] | |
| parent | 3997ad317fdf9ecdb5702e2b4fd1f8229814ff8c [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: timers: more consistently use clock vs timer