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-04-17 10:42:34 -04:00
2008-10-20 08:52:41 -07:00
2007-12-17 19:28:16 -08:00
2007-12-17 19:28:16 -08:00
2007-12-17 19:28:16 -08:00
2005-04-16 15:20:36 -07:00
2007-07-26 11:11:57 -07:00
2005-04-16 15:20:36 -07:00
2006-10-11 11:17:07 -07:00
2007-12-17 19:28:16 -08:00
2008-04-17 10:42:34 -04:00
2008-04-28 08:58:27 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2008-02-05 09:44:21 -08:00
2007-10-16 09:43:03 -07:00
2007-05-30 10:07:54 -07:00
2005-04-16 15:20:36 -07:00
2008-11-30 10:03:35 -08:00
2008-02-05 09:44:07 -08:00
2008-10-20 08:52:41 -07:00
2008-11-30 10:03:35 -08:00