Merge branch 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:43:24 +0000 (09:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:43:24 +0000 (09:43 -0700)
commit9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c
tree476a4894364733bc71d28904259ceae859eff448
parent2ed0e21b30b53d3a94e204196e523e6c8f732b56
parente13cf6e04ebc231653e03ebde4799dc55bf62849
Merge branch 'timers-for-linus-ntp' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  ntp: fix comment typos
  ntp: adjust SHIFT_PLL to improve NTP convergence