diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 23:47:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 23:47:05 +0100 |
| commit | d312c8f81c9810d669cdf13b28f1a5d474738eaf (patch) | |
| tree | aa7adbb2bdf84717bc6ac5c0a3bc936b9bc19116 /drivers/mca | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | [NETFILTER]: nf_conntrack_pptp: fix NAT setup of expected GRE connections (diff) | |
| download | linux-d312c8f81c9810d669cdf13b28f1a5d474738eaf.tar.xz linux-d312c8f81c9810d669cdf13b28f1a5d474738eaf.zip | |
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 'drivers/mca')
0 files changed, 0 insertions, 0 deletions