projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43d78ef
ec2f9d1
)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
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)
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:
1
2
fs/nfs/client.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/dir.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/nfs4_fs.h
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/nfs4proc.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/nfs/super.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/nfs_fs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/nfs_xdr.h
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/auth_gss.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/gss_krb5_crypto.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/gss_krb5_seqnum.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/gss_mech_switch.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/gss_spkm3_token.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/gss_spkm3_unseal.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/auth_gss/svcauth_gss.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/cache.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/clnt.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/pmap_clnt.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/rpc_pipe.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/sched.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/stats.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/svc.c
patch
|
diff1
|
diff2
|
blob
|
history
net/sunrpc/xprt.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
fs/nfs/client.c
Simple merge
diff --cc
fs/nfs/dir.c
Simple merge
diff --cc
fs/nfs/nfs4_fs.h
Simple merge
diff --cc
fs/nfs/nfs4proc.c
Simple merge
diff --cc
fs/nfs/super.c
Simple merge
diff --cc
include/linux/nfs_fs.h
Simple merge
diff --cc
include/linux/nfs_xdr.h
Simple merge
diff --cc
net/sunrpc/auth.c
Simple merge
diff --cc
net/sunrpc/auth_gss/auth_gss.c
Simple merge
diff --cc
net/sunrpc/auth_gss/gss_krb5_crypto.c
Simple merge
diff --cc
net/sunrpc/auth_gss/gss_krb5_seqnum.c
Simple merge
diff --cc
net/sunrpc/auth_gss/gss_mech_switch.c
Simple merge
diff --cc
net/sunrpc/auth_gss/gss_spkm3_token.c
Simple merge
diff --cc
net/sunrpc/auth_gss/gss_spkm3_unseal.c
Simple merge
diff --cc
net/sunrpc/auth_gss/svcauth_gss.c
Simple merge
diff --cc
net/sunrpc/cache.c
Simple merge
diff --cc
net/sunrpc/clnt.c
Simple merge
diff --cc
net/sunrpc/pmap_clnt.c
Simple merge
diff --cc
net/sunrpc/rpc_pipe.c
Simple merge
diff --cc
net/sunrpc/sched.c
Simple merge
diff --cc
net/sunrpc/stats.c
Simple merge
diff --cc
net/sunrpc/svc.c
Simple merge
diff --cc
net/sunrpc/xprt.c
Simple merge