Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (35 commits) [IPV6]: Deinline few large functions in inet6 code [IPV4] ip_fragment: Always compute hash with ipfrag_lock held. [NETFILTER]: Fix DNAT in LOCAL_OUT [X25]: Restore skb->dev setting in x25_type_trans(). [NET]: Fix hotplug race during device registration. [IPV6]: Unexport secure_ipv6_port_ephemeral [NETFILTER]: Fix build with CONFIG_NETFILTER=y/m on IA64 [NET]: More kzalloc conversions. [NET] kzalloc: use in alloc_netdev [PKT_SCHED] act_police: Rename methods. [TG3]: Speed up SRAM access (2nd version) [TG3]: Kill some less useful flags [NETFILTER]: H.323 helper: remove changelog [NETFILTER]: Convert conntrack/ipt_REJECT to new checksumming functions [NETFILTER]: Add address family specific checksum helpers [NETFILTER]: Introduce infrastructure for address family specific operations [NETFILTER]: Fix IP_NF_CONNTRACK_NETLINK dependency [NETFILTER]: H.323 helper: add parameter 'default_rrq_ttl' [NETFILTER]: H.323 helper: make get_h245_addr() static [NETFILTER]: H.323 helper: change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL ...
Showing
- drivers/char/random.c 0 additions, 1 deletiondrivers/char/random.c
- drivers/net/irda/irda-usb.c 343 additions, 20 deletionsdrivers/net/irda/irda-usb.c
- drivers/net/irda/irda-usb.h 29 additions, 14 deletionsdrivers/net/irda/irda-usb.h
- drivers/net/irda/smsc-ircc2.c 311 additions, 0 deletionsdrivers/net/irda/smsc-ircc2.c
- drivers/net/netconsole.c 1 addition, 0 deletionsdrivers/net/netconsole.c
- drivers/net/tg3.c 57 additions, 43 deletionsdrivers/net/tg3.c
- drivers/net/tg3.h 1 addition, 2 deletionsdrivers/net/tg3.h
- include/linux/netfilter.h 35 additions, 7 deletionsinclude/linux/netfilter.h
- include/linux/netfilter_ipv4.h 2 additions, 0 deletionsinclude/linux/netfilter_ipv4.h
- include/linux/netfilter_ipv4/ip_conntrack_h323.h 52 additions, 0 deletionsinclude/linux/netfilter_ipv4/ip_conntrack_h323.h
- include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h 0 additions, 0 deletionsinclude/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
- include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h 0 additions, 0 deletions...ude/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
- include/linux/netfilter_ipv6.h 3 additions, 0 deletionsinclude/linux/netfilter_ipv6.h
- include/net/inet6_hashtables.h 3 additions, 67 deletionsinclude/net/inet6_hashtables.h
- include/net/ip.h 1 addition, 0 deletionsinclude/net/ip.h
- include/net/x25device.h 1 addition, 0 deletionsinclude/net/x25device.h
- net/bluetooth/sco.c 1 addition, 1 deletionnet/bluetooth/sco.c
- net/bridge/br_netfilter.c 11 additions, 2 deletionsnet/bridge/br_netfilter.c
- net/core/dev.c 2 additions, 3 deletionsnet/core/dev.c
- net/core/dv.c 1 addition, 4 deletionsnet/core/dv.c
Loading
Please register or sign in to comment