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-09-08 20:31:04 +02:00
2008-11-27 17:38:28 +01:00
2008-10-13 10:10:37 -07:00
2008-04-17 14:22:23 +02:00