Merge commit 'nfs-for-3.3-4' into nfs-for-next

Conflicts:
	fs/nfs/nfs4proc.c

Back-merge of the upstream kernel in order to fix a conflict with the
slotid type conversion and implementation id patches...

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

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

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

diff --cc include/linux/nfs_xdr.h
Simple merge