J. Bruce Fields 5306293c9c Merge commit 'v2.6.34-rc6' ...

Conflicts:
	fs/nfsd/nfs4callback.c

2010-05-04 11:29:05 -04:00

..

auth.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

auth.h

nfsd: minor fs/nfsd/auth.h cleanup

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

cache.h

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

export.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

Kconfig

nfsd : Define NFSD only when FILE_LOCKING is enabled

2009-03-18 17:30:48 -04:00

lockd.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

Makefile

…

nfs2acl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfs3acl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfs3proc.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

nfs3xdr.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

nfs4acl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfs4callback.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

nfs4idmap.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfs4proc.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

nfs4recover.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfs4state.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

nfs4xdr.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

nfscache.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

nfsctl.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

nfsd.h

nfsd4: allow setting grace period time

2010-03-06 15:02:08 -05:00

nfsfh.c

nfsd: fix "insecure" export option

2009-12-20 20:19:51 -08:00

nfsfh.h

nfsd: move most of nfsfh.h to fs/nfsd

2009-12-15 15:01:46 -05:00

nfsproc.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

nfssvc.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

nfsxdr.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

state.h

nfsd4: allow 4.0 clients to change callback path

2010-04-22 11:34:02 -04:00

stats.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

vfs.c

Merge commit 'v2.6.34-rc6'

2010-05-04 11:29:05 -04:00

vfs.h

nfsd: don't break lease while servicing a COMMIT

2010-03-22 15:37:53 -04:00

xdr3.h

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00

xdr4.h

nfsd4: indentation cleanup

2010-04-19 15:12:51 -04:00

xdr.h

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05:00