From: Linus Torvalds Date: Fri, 8 Apr 2011 18:47:35 +0000 (-0700) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: v2.6.39-rc3~9 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=94c8a984ae2adbd9a9626fb42e0f2faf3e36e86f;p=~emulex%2Finfiniband.git Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Change initial mount authflavor only when server returns NFS4ERR_WRONGSEC NFS: Fix a signed vs. unsigned secinfo bug Revert "net/sunrpc: Use static const char arrays" --- 94c8a984ae2adbd9a9626fb42e0f2faf3e36e86f