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-12-04 17:16:36 +11:00
2008-10-14 11:51:57 -07:00
2008-10-14 11:51:57 -07:00
2007-10-16 09:42:58 -07:00
2008-01-25 14:45:34 -08:00
2007-10-12 11:54:38 -07:00
2008-12-01 14:46:45 -08:00
2008-10-14 11:58:03 -07:00
2008-10-13 17:02:43 -07:00
2008-10-13 13:57:57 -07:00
2008-10-13 13:57:57 -07:00
2008-11-14 11:29:12 +11:00
2008-02-03 17:33:42 +02:00
2008-10-13 17:02:43 -07:00
2008-12-01 14:46:31 -08:00
2008-10-14 11:51:57 -07:00
2008-10-13 17:02:44 -07:00
2008-10-13 13:57:57 -07:00
2008-10-14 11:51:57 -07:00
2008-10-14 11:51:57 -07:00
2008-01-25 15:05:46 -08:00