]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1c0ec8 b292cf9)
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)
* '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

1  2 
fs/nfsd/vfs.c patch | diff1 | diff2 | blob | history
net/sunrpc/svc_xprt.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/vfs.c
Simple merge
diff --cc net/sunrpc/svc_xprt.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.