J. Bruce Fields b1df763723 Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10 ...

Note conflict: Chuck's patches modified (and made static)
gss_mech_get_by_OID, which is still needed by gss-proxy patches.

The conflict resolution is a bit minimal; we may want some more cleanup.

2013-04-29 16:23:34 -04:00

..

addr.h

…

auth_gss.h

…

auth.h

…

bc_xprt.h

…

cache.h

…

clnt.h

…

debug.h

…

gss_api.h

Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10

2013-04-29 16:23:34 -04:00

gss_asn1.h

…

gss_err.h

…

gss_krb5_enctypes.h

…

gss_krb5.h

…

metrics.h

…

msg_prot.h

…

rpc_pipe_fs.h

…

rpc_rdma.h

…

sched.h

…

stats.h

…

svc_rdma.h

…

svc_xprt.h

…

svc.h

…

svcauth_gss.h

…

svcauth.h

…

svcsock.h

…

timer.h

…

types.h

…

xdr.h

…

xprt.h

…

xprtrdma.h

…

xprtsock.h

…