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
..
2012-03-11 19:30:02 -04:00
2013-04-26 11:41:26 -04:00
2013-02-01 10:13:48 -05:00
2012-01-31 19:28:20 -05:00
2012-03-06 18:13:33 -05:00
2013-01-23 18:17:39 -05:00
2011-07-26 16:49:47 -07:00
2013-04-26 11:41:26 -04:00
2012-03-11 19:30:02 -04:00