tree f30acb3e4a35ea96b342f3b1dd25700e7b531def
parent b1c0ec8966fa79891b796f58bf2bda1026ca5566
parent b292cf9ce70d221c3f04ff62db5ab13d9a249ca8
author Linus Torvalds <torvalds@linux-foundation.org> 1262830215 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262830215 -0800

Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.33' of git://linux-nfs.org/~bfields/linux:
  sunrpc: fix peername failed on closed listener
  nfsd: make sure data is on disk before calling ->fsync
  nfsd: fix "insecure" export option