Merge branch 'devel'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Apr 2008 18:01:02 +0000 (14:01 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 24 Apr 2008 18:01:02 +0000 (14:01 -0400)
commit233607dbbc823caf685e778cabc49fb7f679900b
tree13840137ee10788061cbec60fcfe8ea4c274558e
parent3dc5063786b273f1aee545844f6bd4e9651ebffe
parentb48633bd086d21f4a2a5bea96c7e6c7ba58eb60c
Merge branch 'devel'
fs/Kconfig
fs/nfs/dir.c
fs/nfs/file.c
fs/nfs/inode.c
fs/nfs/super.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/clnt.c
net/sunrpc/rpcb_clnt.c
net/sunrpc/xprtsock.c