]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1056583b6b9f8a8def425f01ccc8142a38302b5e
tree143956f878290e85de7c9130f465e862f587ee53
parenta1a02b4a0d881c0021ea6494826a8a48029d5cd0
parent1d9740cefb4684f96d2d5b68bce16adf3d1373f9
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