| commit | b1df7637232927ac69ed1a32e9c6b768f635b7d4 | [log] [tgz] |
|---|---|---|
| author | J. Bruce Fields <bfields@redhat.com> | Mon Apr 29 14:03:30 2013 -0400 |
| committer | J. Bruce Fields <bfields@redhat.com> | Mon Apr 29 16:23:34 2013 -0400 |
| tree | cf5fdd96cccb3a89f4e0dea895775eb7c428c533 | |
| parent | dd30333cf5a2f9dfecda5c6f4523133f13847aae [diff] | |
| parent | 721ccfb79b6f74f4052de70236d24047e73682d4 [diff] |
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.