From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 24 Jul 2007 22:57:12 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.23-rc2~295
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=03746bad30890284cc14fc39184c5b60b9cb8bc9;p=~shefty%2Frdma-dev.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [8021Q]: vlan_ioctl_handler: fix return value
  [GENETLINK]: Correctly report errors while registering a multicast group
  [GENETLINK]: Fix adjustment of number of multicast groups
  [GENETLINK]: Fix race in genl_unregister_mc_groups()
  [NETFILTER]: Clean up duplicate includes in net/netfilter/
  [NETFILTER]: Clean up duplicate includes in net/bridge/
  [NETFILTER]: Fix logging regression
  [TCPv6] MD5SIG: Ensure to reset allocation count to avoid panic.
---

03746bad30890284cc14fc39184c5b60b9cb8bc9