From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sat, 17 Mar 2007 02:28:52 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~31002
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24c4ac070adffe4a21f3a8daf4aee7c98fa6c4f9;p=kernel%2Fkernel-generic.git

Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV6]: ipv6_fl_socklist is inadvertently shared.
  [TCP]: Fix tcp_mem[] initialization.
  [NET]: Copy mac_len in skb_clone() as well
  [IPV4]: Do not disable preemption in trie_leaf_remove().
---

24c4ac070adffe4a21f3a8daf4aee7c98fa6c4f9