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-06 11:06:14 +02:00
2008-11-06 11:06:31 +02:00
2008-12-04 17:16:36 +11:00
2008-11-21 18:59:33 +02:00
2008-11-06 11:06:31 +02:00
2008-11-06 11:06:31 +02:00
2008-11-06 11:06:31 +02:00
2008-11-06 11:06:31 +02:00
2008-11-21 18:59:33 +02:00
2008-11-21 18:59:25 +02:00
2008-11-21 18:59:33 +02:00