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-11-14 10:39:25 +11:00
2008-11-12 23:23:51 -08:00
2008-11-19 14:07:41 -08:00
2008-10-16 11:21:47 -07:00
2008-11-12 01:41:09 -08:00