From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 25 Mar 2006 16:39:20 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17-rc1~738
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=b55813a2e50088ca30df33fa62aeed5d3adb1796;p=safe%2Fjmp%2Flinux-2.6

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER] x_table.c: sem2mutex
  [IPV4]: Aggregate route entries with different TOS values
  [TCP]: Mark tcp_*mem[] __read_mostly.
  [TCP]: Set default max buffers from memory pool size
  [SCTP]: Fix up sctp_rcv return value
  [NET]: Take RTNL when unregistering notifier
  [WIRELESS]: Fix config dependencies.
  [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms.
  [NET]: Ensure device name passed to SO_BINDTODEVICE is NULL terminated.
  [MODULES]: Don't allow statically declared exports
  [BRIDGE]: Unaligned accesses in the ethernet bridge
---

b55813a2e50088ca30df33fa62aeed5d3adb1796