tree a4beddd64501ef00ad41c8fd5974340bec2fcf73
parent f9fa0bc1fabe1d861e46d80ecbe7e85da359195c
parent 37adb89fadd65ce47f7e5cfd564938a76b351948
author Linus Torvalds <torvalds@linux-foundation.org> 1302288455 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302288455 -0700

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"