Merge branch 'osd-devel' into nfs-for-next

author Trond Myklebust <[email protected]>

Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)

committer Trond Myklebust <[email protected]>

Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
author Trond Myklebust <[email protected]>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
committer Trond Myklebust <[email protected]>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
diff --cc fs/nfs/file.c
Simple merge
diff --cc include/linux/sunrpc/clnt.h
Simple merge
diff --cc include/linux/sunrpc/svc.h
Simple merge
diff --cc net/sunrpc/svc.c
Simple merge
author	Trond Myklebust <[email protected]>
	Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
committer	Trond Myklebust <[email protected]>
	Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
		1	2
fs/nfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/clnt.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sunrpc/svc.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc.c	patch \|	diff1 \|	diff2 \|	blob \| history