git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd30333 721ccfb)
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)
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.


Trivial merge
Pandora Kernel Repository