tree 818add523a6b81b560bebac727c57c6a8ea6fd63
parent d1126ad907ce197ff45fbc2369fbeaf8ae6f75a8
parent 0a377cff9428af2da2b293d11e07bc4dbf064ee5
author Linus Torvalds <torvalds@linux-foundation.org> 1282171523 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282171523 -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: Fix an Oops in the NFSv4 atomic open code
  NFS: Fix the selection of security flavours in Kconfig
  NFS: fix the return value of nfs_file_fsync()
  rpcrdma: Fix SQ size calculation when memreg is FRMR
  xprtrdma: Do not truncate iova_start values in frmr registrations.
  nfs: Remove redundant NULL check upon kfree()
  nfs: Add "lookupcache" to displayed mount options
  NFS: allow close-to-open cache semantics to apply to root of NFS filesystem
  SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)