James Morris 2b82892565 Merge branch 'master' into next ...

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

2008-11-14 11:29:12 +11:00

..

auth.c

CRED: Differentiate objective and effective subjective credentials on a task

2008-11-14 10:39:26 +11:00

auth.h

nfsd: minor fs/nfsd/auth.h cleanup

2008-02-01 16:42:05 -05:00

export.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2008-10-23 10:22:40 -07:00

lockd.c

nfsd: common grace period control

2008-10-03 16:19:02 -04:00

Makefile

knfsd: trivial makefile cleanup

2007-05-09 12:30:54 -07:00

nfs2acl.c

nfsd: rename MAY_ flags

2008-06-23 13:02:50 -04:00

nfs3acl.c

nfsd: rename MAY_ flags

2008-06-23 13:02:50 -04:00

nfs3proc.c

nfsd: permit unauthenticated stat of export root

2008-09-29 17:56:56 -04:00

nfs3xdr.c

Use struct path in struct svc_export

2008-02-14 21:17:08 -08:00

nfs4acl.c

nfsd: fix buffer overrun decoding NFSv4 acl

2008-09-01 14:24:24 -04:00

nfs4callback.c

nfsd: use nfs client rpc callback program

2008-09-29 18:13:40 -04:00

nfs4idmap.c

nfsd: fix sparse warnings

2008-04-23 16:13:39 -04:00

nfs4proc.c

nfsd: common grace period control

2008-10-03 16:19:02 -04:00

nfs4recover.c

CRED: Inaugurate COW credentials

2008-11-14 10:39:23 +11:00

nfs4state.c

[PATCH] switch nfsd to kern_path()

2008-10-23 05:12:51 -04:00

nfs4xdr.c

nfsd: nfs4xdr decode_stateid helper function

2008-09-29 17:56:59 -04:00

nfscache.c

nfsd: fail module init on reply cache init failure

2008-02-01 16:42:04 -05:00

nfsctl.c

[PATCH] switch nfsd to kern_path()

2008-10-23 05:12:51 -04:00

nfsfh.c

CRED: Inaugurate COW credentials

2008-11-14 10:39:23 +11:00

nfsproc.c

nfsd: permit unauthenticated stat of export root

2008-09-29 17:56:56 -04:00

nfssvc.c

NFSD: Fix BUG during NFSD shutdown processing

2008-10-22 13:36:05 -04:00

nfsxdr.c

Use struct path in struct svc_export

2008-02-14 21:17:08 -08:00

stats.c

[PATCH] knfsd: nfsd4: add per-operation server stats

2006-07-10 13:24:27 -07:00

vfs.c

Merge branch 'master' into next

2008-11-14 11:29:12 +11:00