pilppa.com Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
commit	d9bc125caf592b7d081021f32ce5b717efdf70c8
tree	263b7066ba22ddce21db610c0300f6eaac6f2064	tree \| snapshot
parent	43d78ef2ba5bec26d0315859e8324bfc0be23766	commit \| diff
parent	ec2f9d1331f658433411c58077871e1eef4ee1b4	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4_fs.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_xdr.h	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_krb5_crypto.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_krb5_seqnum.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_mech_switch.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_spkm3_token.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_spkm3_unseal.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/svcauth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/cache.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/pmap_clnt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/rpc_pipe.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/sched.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/stats.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprt.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

fs/nfs/client.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/dir.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4_fs.h	diff1 \|	diff2 \|	blob \| history
fs/nfs/nfs4proc.c	diff1 \|	diff2 \|	blob \| history
fs/nfs/super.c	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/nfs_xdr.h	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/auth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_krb5_crypto.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_krb5_seqnum.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_mech_switch.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_spkm3_token.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/gss_spkm3_unseal.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth_gss/svcauth_gss.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/cache.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/pmap_clnt.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/rpc_pipe.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/sched.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/stats.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/svc.c	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprt.c	diff1 \|	diff2 \|	blob \| history