diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 18:43:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 18:43:24 +0200 |
| commit | 9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c (patch) | |
| tree | 476a4894364733bc71d28904259ceae859eff448 /kernel/time | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 (diff) | |
| parent | ntp: fix comment typos (diff) | |
| download | linux-9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c.tar.xz linux-9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c.zip | |
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
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions