Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Apr 2011 18:47:35 +0000 (11:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Apr 2011 18:47:35 +0000 (11:47 -0700)
commit94c8a984ae2adbd9a9626fb42e0f2faf3e36e86f
treea4beddd64501ef00ad41c8fd5974340bec2fcf73
parentf9fa0bc1fabe1d861e46d80ecbe7e85da359195c
parent37adb89fadd65ce47f7e5cfd564938a76b351948
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"