diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:14:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:14:23 -0700 |
commit | 33217379becdee25021cabb25032b3bf703d0e96 (patch) | |
tree | 27cfbb722a523950ec8c9f616f28a1767498601a /fs/ocfs2 | |
parent | feeedc6c820e1026453ad865076cee435f24d30a (diff) | |
parent | 30bc4dfd3b64eb1fbefe2c63e30d8fc129273e20 (diff) |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
nfsd: clean up expkey_parse error cases
nfsd: Drop reference in expkey_parse error cases
nfsd: Fix memory leak in nfsd_getxattr
NFSD: Fix BUG during NFSD shutdown processing
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions