Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 04:29:21 +0000 (20:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Feb 2009 04:29:21 +0000 (20:29 -0800)
commitf7e603ad8f78cd3b59e33fa72707da0cbabdf699
treeb7ddd5d835137f324424b3a93436dcca581ec1b6
parentcac711211a039ae2e2dc6322ffb3c2279d093bf1
parent50fee1dec5d71b8a14c1b82f2f42e16adc227f8b
Merge git://git./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