Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jan 2010 02:10:15 +0000 (18:10 -0800)
commit93939f4e5df30e6229a0b5257fdcaf3faf88471c
treef30acb3e4a35ea96b342f3b1dd25700e7b531def
parentb1c0ec8966fa79891b796f58bf2bda1026ca5566
parentb292cf9ce70d221c3f04ff62db5ab13d9a249ca8
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
fs/nfsd/vfs.c
net/sunrpc/svc_xprt.c