diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 09:04:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 09:04:35 +0100 |
| commit | 25f666300625d894ebe04bac2b4b3aadb907c861 (patch) | |
| tree | 47547369f2d6eb366268e85252444ecb1bdcfab5 /kernel/time/ntp.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 (diff) | |
| parent | [NET_SCHED] sch_htb: htb_requeue fix (diff) | |
| download | linux-25f666300625d894ebe04bac2b4b3aadb907c861.tar.xz linux-25f666300625d894ebe04bac2b4b3aadb907c861.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
[NET_SCHED] sch_htb: htb_requeue fix
[IPV6]: Replace using the magic constant "1024" with IP6_RT_PRIO_USER for fc_metric.
starfire: secton fix
via-velocity: section fix
natsemi: section fix
typhoon: section fix
isdn: fix section mismatch warning for ISACVer
isdn: fix section mismatch warnings from hisax_cs_setup_card
isdn: fix section mismatch warnings in isac.c and isar.c
isdn: fix section mismatch warning in hfc_sx.c
[PKT_SCHED] ematch: tcf_em_destroy robustness
[PKT_SCHED]: deinline functions in meta match
[SCTP]: Convert sctp_dbg_objcnt to seq files.
[SCTP]: Use snmp_fold_field instead of a homebrew analogue.
[IGMP]: Optimize kfree_skb in igmp_rcv.
[KEY]: Convert net/pfkey to use seq files.
[KEY]: Clean up proc files creation a bit.
pppol2tp: fix printk warnings
bnx2: section fix
bnx2x: section fix
...
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions