Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:08:08 +0000 (14:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 21:08:08 +0000 (14:08 -0700)
commit62bea97f54d806218a992b18d1f425cfb5060175
tree56269aab888af586f4f63ed6a05286d11e46168c
parentb61f6a57f1919ef8dbd33f864df9b8b361c65b11
parent8af3c153baf95374eff20a37f00c59a295b52756
Merge branch 'timers-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ntp: Clamp PLL update interval