James Morris ec98ce480a 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>
2008-12-04 17:16:36 +11:00
..
2008-12-04 17:16:36 +11:00
2008-10-31 23:37:57 +01:00
2008-12-01 19:55:24 -08:00
2008-12-04 17:16:36 +11:00
2008-11-30 10:03:37 -08:00
2008-12-04 17:16:36 +11:00
2008-12-04 17:16:36 +11:00
2008-12-04 17:16:36 +11:00
2008-12-04 17:16:36 +11:00
2008-12-04 17:16:36 +11:00
2008-11-30 11:00:15 -08:00