Merge commit 'v2.6.30' into for-2.6.31
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
commit7eef4091a653c243a87e5375c54504cc03bec4d8
treef65b77f830b2c8f7d014512badfef5df0d591ee9
parent0a93a47f042c459f0f46942c3a920e3c81878031
parent07a2039b8eb0af4ff464efd3dfd95de5c02648c6
Merge commit 'v2.6.30' into for-2.6.31
fs/nfsd/nfs4state.c
fs/nfsd/nfs4xdr.c
include/linux/fs.h
net/sunrpc/svcsock.c