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
..
2007-10-12 14:05:17 +10:00
2007-05-21 09:18:19 -07:00
2008-07-24 10:47:15 -07:00
2008-07-16 11:07:59 +10:00