From: Linus Torvalds Date: Fri, 26 Jan 2007 22:47:05 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 X-Git-Tag: upstream/snapshot3+hdmi~36115 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d312c8f81c9810d669cdf13b28f1a5d474738eaf;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge /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 --- d312c8f81c9810d669cdf13b28f1a5d474738eaf