Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- include/linux/ipv6_route.h 1 addition, 0 deletionsinclude/linux/ipv6_route.h
- include/net/if_inet6.h 1 addition, 0 deletionsinclude/net/if_inet6.h
- net/8021q/vlan.c 5 additions, 1 deletionnet/8021q/vlan.c
- net/dccp/ipv4.c 1 addition, 1 deletionnet/dccp/ipv4.c
- net/ipv6/addrconf.c 98 additions, 13 deletionsnet/ipv6/addrconf.c
- net/ipv6/icmp.c 14 additions, 2 deletionsnet/ipv6/icmp.c
- net/ipv6/route.c 9 additions, 4 deletionsnet/ipv6/route.c
- net/netrom/nr_in.c 3 additions, 3 deletionsnet/netrom/nr_in.c
- net/xfrm/xfrm_policy.c 29 additions, 1 deletionnet/xfrm/xfrm_policy.c
Please register or sign in to comment