commit | 62bea97f54d806218a992b18d1f425cfb5060175 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 14:08:08 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 21 14:08:08 2010 -0700 |
tree | 56269aab888af586f4f63ed6a05286d11e46168c | |
parent | b61f6a57f1919ef8dbd33f864df9b8b361c65b11 [diff] | |
parent | 8af3c153baf95374eff20a37f00c59a295b52756 [diff] |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/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