Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:29:42 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Feb 2009 22:29:42 +0000 (14:29 -0800)
commit29a0c5ce5d008f398346d644456d62ab300d5e10
treef549f6c78905f318f0e6342edede01cb7c0561b9
parentf8effd1a4a1833eac90261d78abacfaefe3d99e4
parent3997ad317fdf9ecdb5702e2b4fd1f8229814ff8c
Merge branch 'timers-fixes-for-linus' of git://git./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