Merge commit 'v2.6.30' into for-2.6.31

author J. Bruce Fields <bfields@citi.umich.edu>

Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)

committer J. Bruce Fields <bfields@citi.umich.edu>

Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
author J. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
committer J. Bruce Fields <bfields@citi.umich.edu>
Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
diff --cc fs/nfsd/nfs4state.c
Simple merge
diff --cc fs/nfsd/nfs4xdr.c
Simple merge
diff --cc include/linux/fs.h
Simple merge
diff --cc net/sunrpc/svcsock.c
Simple merge
author	J. Bruce Fields <bfields@citi.umich.edu>
	Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
committer	J. Bruce Fields <bfields@citi.umich.edu>
	Tue, 16 Jun 2009 01:08:07 +0000 (18:08 -0700)
		1	2
fs/nfsd/nfs4state.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4xdr.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svcsock.c	patch \|	diff1 \|	diff2 \|	blob \| history