Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commit6762b47a74264152eeda5ac7516732fe9be265a7
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Apr 2006 16:54:39 +0000 (12 09:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Apr 2006 16:54:39 +0000 (12 09:54 -0700)
tree16aee054ebd304c3030faaa030779b6e8d0c25e9
parentdcccdd938ef0c5d96145957217b814b14bd46cdc
parent052bb88e180d010f7da7186e6f21eea3be82a903
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.