]> 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)
commitc8a98d9e45338dc13f778a927dde15004a13fe01
treed6206d42dea7298f7ef05fd1f7bf474245f0d43a
parentc99358deaa112d2144fa8be491faf8575c29eead
parent05f5d7c59a13e1c127b2df09b22b64c2ff433ce8
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