Merge branch 'nfs-for-2.6.33'

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

diff --cc net/sunrpc/auth.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
Simple merge