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)
* '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"


Trivial merge