From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 2 Nov 2006 16:50:46 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~31920^2~20^2~246
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb193e405155c5680ca1560b040b1551566660f9;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:
  [NETFILTER]: silence a warning in ebtables
  [IPV6]: File the fingerprints off ah6->spi/esp6->spi
  [TCP]: Set default congestion control when no sysctl.
  [TIPC] net/tipc/port.c: fix NULL dereference
---

eb193e405155c5680ca1560b040b1551566660f9