Merge branch 'osd-devel' into nfs-for-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 3 Nov 2011 03:56:40 +0000 (23:56 -0400)
commit31cbecb4ab538f433145bc5a46f3bea9b9627031
treed6206d42dea7298f7ef05fd1f7bf474245f0d43a
parent2b72c9ccd22c4a3299e5a358dcd639fb253730f4
parent278c023a99b0d6b471d0f4a79835c703482e29ac
Merge branch 'osd-devel' into nfs-for-next
fs/nfs/file.c
include/linux/sunrpc/clnt.h
include/linux/sunrpc/svc.h
net/sunrpc/svc.c