Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 29 Apr 2013 18:03:30 +0000 (14:03 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 29 Apr 2013 20:23:34 +0000 (16:23 -0400)
commitb1df7637232927ac69ed1a32e9c6b768f635b7d4
treecf5fdd96cccb3a89f4e0dea895775eb7c428c533
parentdd30333cf5a2f9dfecda5c6f4523133f13847aae
parent721ccfb79b6f74f4052de70236d24047e73682d4
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.
fs/nfs/super.c
fs/nfsd/nfs4xdr.c
include/linux/sunrpc/gss_api.h
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/auth_gss/gss_krb5_mech.c
net/sunrpc/auth_gss/gss_mech_switch.c
net/sunrpc/auth_gss/gss_rpc_upcall.c
net/sunrpc/auth_gss/gss_rpc_upcall.h
net/sunrpc/auth_gss/svcauth_gss.c
net/sunrpc/clnt.c