tree b7ddd5d835137f324424b3a93436dcca581ec1b6
parent cac711211a039ae2e2dc6322ffb3c2279d093bf1
parent 50fee1dec5d71b8a14c1b82f2f42e16adc227f8b
author Linus Torvalds <torvalds@linux-foundation.org> 1235449761 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235449761 -0800

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