From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Feb 2009 04:29:21 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.29-rc7~65
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f7e603ad8f78cd3b59e33fa72707da0cbabdf699;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: amend the fix for SO_BSDCOMPAT gsopt infoleak
  netns: build fix for net_alloc_generic
---

f7e603ad8f78cd3b59e33fa72707da0cbabdf699