]> err.no Git - linux-2.6/commit
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
commitd9bc125caf592b7d081021f32ce5b717efdf70c8
tree263b7066ba22ddce21db610c0300f6eaac6f2064
parent43d78ef2ba5bec26d0315859e8324bfc0be23766
parentec2f9d1331f658433411c58077871e1eef4ee1b4
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c

Merge with mainline and fix conflicts.
23 files changed:
fs/nfs/client.c
fs/nfs/dir.c
fs/nfs/nfs4_fs.h
fs/nfs/nfs4proc.c
fs/nfs/super.c
include/linux/nfs_fs.h
include/linux/nfs_xdr.h
net/sunrpc/auth.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_krb5_seqnum.c
net/sunrpc/auth_gss/gss_mech_switch.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/auth_gss/gss_spkm3_unseal.c
net/sunrpc/auth_gss/svcauth_gss.c
net/sunrpc/cache.c
net/sunrpc/clnt.c
net/sunrpc/pmap_clnt.c
net/sunrpc/rpc_pipe.c
net/sunrpc/sched.c
net/sunrpc/stats.c
net/sunrpc/svc.c
net/sunrpc/xprt.c