Merge branch 'nfs-for-2.6.32'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
commitab3bbaa8b257845e248e9a01d12a69ca245f4197
treef3054be9bd612194826ed6969d01346d329c3306
parent332a3392188e0ad966543c87b8da2b9d246f301d
parent2ecda72b49a0849ce41e7fa1fa974a245b9119f8
Merge branch 'nfs-for-2.6.32'
fs/nfs/client.c
net/sunrpc/clnt.c