From: Linus Torvalds Date: Thu, 7 Jan 2010 02:10:15 +0000 (-0800) Subject: Merge branch 'for-2.6.33' of git://linux-nfs.org/~bfields/linux X-Git-Tag: firefly_0821_release~9833^2~3469 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93939f4e5df30e6229a0b5257fdcaf3faf88471c;p=firefly-linux-kernel-4.4.55.git 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 --- 93939f4e5df30e6229a0b5257fdcaf3faf88471c