usagi/kernel/linux25/net netsyms.c usagi/kernel/linux25/net/core neighbour.c usagi/kernel/linux25/net/decnet dn_nsp_out.c dn_route.c usagi/kernel/linux25/net/ipv4 ah.c esp.c igmp.c ip_output.c tcp_ipv4.c usagi/kernel/linux25/net/key af_key.c

miyazawa    2003/05/09 12:49:38 JST

  Modified files:
    kernel/linux25/net   netsyms.c 
    kernel/linux25/net/core neighbour.c 
    kernel/linux25/net/decnet dn_nsp_out.c dn_route.c 
    kernel/linux25/net/ipv4 ah.c esp.c igmp.c ip_output.c 
                            tcp_ipv4.c 
    kernel/linux25/net/key af_key.c 
  Log:
  sync with linux-2.5.69; conflicts resolved
  
  Revision  Changes    Path
  1.26      +2 -0      usagi/kernel/linux25/net/netsyms.c
  1.5       +89 -89    usagi/kernel/linux25/net/core/neighbour.c
  1.4       +1 -1      usagi/kernel/linux25/net/decnet/dn_nsp_out.c
  1.4       +3 -2      usagi/kernel/linux25/net/decnet/dn_route.c
  1.13      +2 -3      usagi/kernel/linux25/net/ipv4/ah.c
  1.14      +2 -4      usagi/kernel/linux25/net/ipv4/esp.c
  1.7       +129 -59   usagi/kernel/linux25/net/ipv4/igmp.c
  1.4       +4 -4      usagi/kernel/linux25/net/ipv4/ip_output.c
  1.9       +6 -8      usagi/kernel/linux25/net/ipv4/tcp_ipv4.c
  1.10      +4 -8      usagi/kernel/linux25/net/key/af_key.c