Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

author Linus Torvalds <[email protected]>

Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)

committer Linus Torvalds <[email protected]>

Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
author Linus Torvalds <[email protected]>
Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
committer Linus Torvalds <[email protected]>
Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
diff --cc fs/nfsd/vfs.c
Simple merge
diff --cc net/sunrpc/svc_xprt.c
Simple merge
author	Linus Torvalds <[email protected]>
	Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
committer	Linus Torvalds <[email protected]>
	Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
		1	2
fs/nfsd/vfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc_xprt.c	patch \|	diff1 \|	diff2 \|	blob \| history