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
..
2013-03-11 22:05:56 +01:00
2013-03-12 18:55:21 -07:00
2013-03-12 18:55:21 -07:00
2013-03-12 18:55:21 -07:00
2013-03-12 18:55:21 -07:00
2013-02-22 23:31:31 -05:00
2013-02-22 23:31:31 -05:00
2012-10-22 08:50:37 +03:00
2013-02-22 23:31:31 -05:00
2013-02-22 23:31:31 -05:00
2013-02-28 13:21:44 -08:00
2013-02-22 23:31:31 -05:00
2012-12-20 18:46:29 -05:00
2013-02-22 23:31:31 -05:00
2012-12-11 13:43:42 +09:00
2013-02-22 23:31:31 -05:00
2013-03-12 08:29:17 -07:00
2013-02-22 23:31:31 -05:00
2012-12-17 17:15:27 -08:00
2013-02-26 02:46:08 -05:00
2013-02-22 23:31:31 -05:00