aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 14:47:05 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 14:47:05 -0800
commitd312c8f81c9810d669cdf13b28f1a5d474738eaf (patch)
treeaa7adbb2bdf84717bc6ac5c0a3bc936b9bc19116 /arch
parent08eacc3157baf5d14c8e2c4ffc77c13a0ac8a85b (diff)
parent7399072a7348d025e7bcb5eb5d5e9be941d490b7 (diff)
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: [NETFILTER]: nf_conntrack_pptp: fix NAT setup of expected GRE connections [NETFILTER]: nf_nat_pptp: fix expectation removal [NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack [TCP]: Restore SKB socket owner setting in tcp_transmit_skb(). [AF_PACKET]: Check device down state before hard header callbacks. [DECNET]: Handle a failure in neigh_parms_alloc (take 2) [BNX2]: Fix 2nd port's MAC address. [TCP]: Fix sorting of SACK blocks. [AF_PACKET]: Fix BPF handling. [IPV4]: Fix the fib trie iterator to work with a single entry routing tables
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions