From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 12 Apr 2006 16:54:39 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6762b47a74264152eeda5ac7516732fe9be265a7;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [ISDN]: Static overruns in drivers/isdn/i4l/isdn_ppp.c
  [WAN]: Remove broken and unmaintained Sangoma drivers.
  [BRIDGE] ebtables: fix allocation in net/bridge/netfilter/ebtables.c
  [DCCP]: Fix leak in net/dccp/ipv4.c
  [BRIDGE]: receive link-local on disabled ports.
  [IPv6] reassembly: Always compute hash under the fragment lock.
---

6762b47a74264152eeda5ac7516732fe9be265a7