From: J. Bruce Fields <bfields@redhat.com>
Date: Mon, 29 Apr 2013 18:03:30 +0000 (-0400)
Subject: Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~48^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1df7637232927ac69ed1a32e9c6b768f635b7d4;p=pandora-kernel.git

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.
---

b1df7637232927ac69ed1a32e9c6b768f635b7d4
Reading git-diff-tree failed