Merge branch 'devel-for-2.6.31' into for-2.6.31
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 18 Jun 2009 01:13:00 +0000 (18:13 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 19 Jun 2009 01:13:44 +0000 (18:13 -0700)
commit1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81
tree143956f878290e85de7c9130f465e862f587ee53
parent301933a0acfdec837fd8b4884093b3f0fff01d8a
parent4bf259e3ae5015e73282ba66716c4a917e1264ac
Merge branch 'devel-for-2.6.31' into for-2.6.31

Conflicts:
fs/nfs/client.c
fs/nfs/super.c
fs/nfs/callback.c
fs/nfs/client.c
fs/nfs/internal.h
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c
fs/nfs/super.c
net/sunrpc/xprtsock.c