diff options
author | 2010-10-21 14:08:08 -0700 | |
---|---|---|
committer | 2010-10-21 14:08:08 -0700 | |
commit | 62bea97f54d806218a992b18d1f425cfb5060175 (patch) | |
tree | 56269aab888af586f4f63ed6a05286d11e46168c /init/main.c | |
parent | Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
parent | ntp: Clamp PLL update interval (diff) | |
download | linux-62bea97f54d806218a992b18d1f425cfb5060175.tar.gz linux-62bea97f54d806218a992b18d1f425cfb5060175.tar.bz2 linux-62bea97f54d806218a992b18d1f425cfb5060175.zip |
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
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions