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-03-15 19:12:19 -07:00
2008-10-10 16:32:30 +00:00
2008-07-02 15:06:24 -06:00
2007-07-29 17:09:29 -07:00
2008-11-20 13:09:17 -08:00
2008-10-10 16:32:28 +00:00
2008-10-10 16:32:30 +00:00