aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-23 20:29:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-23 20:29:21 -0800
commitf7e603ad8f78cd3b59e33fa72707da0cbabdf699 (patch)
treeb7ddd5d835137f324424b3a93436dcca581ec1b6 /fs
parentcac711211a039ae2e2dc6322ffb3c2279d093bf1 (diff)
parent50fee1dec5d71b8a14c1b82f2f42e16adc227f8b (diff)
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions