Merge commit 'linux-pnfs/nfs41-for-2.6.31' into nfsv41-for-2.6.31

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

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

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