Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Showing
- drivers/connector/cn_queue.c 19 additions, 13 deletionsdrivers/connector/cn_queue.c
- drivers/connector/connector.c 38 additions, 36 deletionsdrivers/connector/connector.c
- include/linux/connector.h 15 additions, 6 deletionsinclude/linux/connector.h
- include/linux/netfilter_ipv4/ip_nat_core.h 5 additions, 7 deletionsinclude/linux/netfilter_ipv4/ip_nat_core.h
- include/linux/sysctl.h 25 additions, 1 deletioninclude/linux/sysctl.h
- include/net/llc.h 30 additions, 0 deletionsinclude/net/llc.h
- include/net/llc_conn.h 8 additions, 7 deletionsinclude/net/llc_conn.h
- include/net/llc_sap.h 6 additions, 2 deletionsinclude/net/llc_sap.h
- net/802/p8022.c 1 addition, 1 deletionnet/802/p8022.c
- net/802/psnap.c 1 addition, 1 deletionnet/802/psnap.c
- net/802/tr.c 1 addition, 1 deletionnet/802/tr.c
- net/core/dev.c 2 additions, 0 deletionsnet/core/dev.c
- net/ipv4/netfilter/Makefile 3 additions, 2 deletionsnet/ipv4/netfilter/Makefile
- net/ipv4/netfilter/ip_nat_core.c 24 additions, 11 deletionsnet/ipv4/netfilter/ip_nat_core.c
- net/ipv4/netfilter/ip_nat_helper.c 4 additions, 0 deletionsnet/ipv4/netfilter/ip_nat_helper.c
- net/ipv4/netfilter/ip_nat_standalone.c 4 additions, 21 deletionsnet/ipv4/netfilter/ip_nat_standalone.c
- net/ipv6/addrconf.c 2 additions, 0 deletionsnet/ipv6/addrconf.c
- net/llc/Makefile 1 addition, 0 deletionsnet/llc/Makefile
- net/llc/af_llc.c 302 additions, 199 deletionsnet/llc/af_llc.c
- net/llc/llc_c_ac.c 98 additions, 173 deletionsnet/llc/llc_c_ac.c
Please register or sign in to comment