tree 1a4d644b38f9f1e4b4e086fde0b195df4a92cf84
parent 3496f92beb9aa99ef21fccc154a36c7698e9c538
parent feaf3848a813a106f163013af6fcf6c4bfec92d9
author James Morris <jmorris@namei.org> 1228371396 +1100
committer James Morris <jmorris@namei.org> 1228371396 +1100

Merge branch 'master' into next

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>