NFS: Keep module parameters in the generic NFS client

Otherwise we break backwards compatibility when v4 becomes a modules.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

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

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

diff --cc fs/nfs/nfs4_fs.h
Simple merge

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

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

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

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