]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit26ca7b4ce37c1d5d942acae9662fa8893e007558
treed6206d42dea7298f7ef05fd1f7bf474245f0d43a
parentfe0d57dc310520085cbf742e48a8530003197711
parentc6a7dbe8a367f719ee782602560ee77f04ad2334
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