]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jul 2009 19:09:57 +0000 (12:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Jul 2009 19:09:57 +0000 (12:09 -0700)
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: Save mult_orig in clocksource_disable()


Trivial merge