Merge branch 'nfs-for-2.6.33'
Trond Myklebust [Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)]
1  2 
fs/nfs/write.c
net/sunrpc/auth.c
net/sunrpc/xprtsock.c

diff --cc fs/nfs/write.c
Simple merge
Simple merge
Simple merge