path: root/net/netfilter/nf_tproxy_core.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 14:15:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 14:15:05 -0800
commit4c3021da451fe0ea1deaba8fa3805d8d065ec84e (patch)
tree7dba26f1fb51be87dfd5d136ddbbd752b60e9a6c /net/netfilter/nf_tproxy_core.c
parenta5bbef0b2deb7b943f095181309ecc9e1fc91c0f (diff)
parentceaaec98ad99859ac90ac6863ad0a6cd075d8e0e (diff)
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: (37 commits) net: deinit automatic LIST_HEAD net: dont leave active on stack LIST_HEAD net: provide default_advmss() methods to blackhole dst_ops tg3: Restrict phy ioctl access drivers/net: Call netif_carrier_off at the end of the probe ixgbe: work around for DDP last buffer size ixgbe: fix panic due to uninitialised pointer e1000e: flush all writebacks before unload e1000e: check down flag in tasks isdn: hisax: Use l2headersize() instead of dup (and buggy) func. arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS. cxgb4vf: Use defined Mailbox Timeout cxgb4vf: Quiesce Virtual Interfaces on shutdown ... cxgb4vf: Behave properly when CONFIG_DEBUG_FS isn't defined ... cxgb4vf: Check driver parameters in the right place ... pch_gbe: Fix the MAC Address load issue. iwlwifi: Delete iwl3945_good_plcp_health. net/can/softing: make CAN_SOFTING_CS depend on CAN_SOFTING netfilter: nf_iterate: fix incorrect RCU usage pch_gbe: Fix the issue that the receiving data is not normal. ...
Diffstat (limited to 'net/netfilter/nf_tproxy_core.c')
0 files changed, 0 insertions, 0 deletions