tree 476a4894364733bc71d28904259ceae859eff448
parent 2ed0e21b30b53d3a94e204196e523e6c8f732b56
parent e13cf6e04ebc231653e03ebde4799dc55bf62849
author Linus Torvalds <torvalds@linux-foundation.org> 1245084204 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245084204 -0700

Merge branch 'timers-for-linus-ntp' of git://git.kernel.org/pub/scm/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