Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2010 19:18:02 +0000 (12:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jun 2010 19:18:02 +0000 (12:18 -0700)
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  nohz: Fix nohz ratelimit


Trivial merge