Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
auth.c
auth.h
cache.h
export.c	Revert "nfsd4: fix error return when pseudoroot missing"	2010-02-08 15:25:23 -05:00
Kconfig
lockd.c
Makefile
nfs2acl.c
nfs3acl.c
nfs3proc.c
nfs3xdr.c
nfs4acl.c
nfs4callback.c	nfsd4: fix minor memory leak	2010-03-03 16:13:29 -05:00
nfs4idmap.c
nfs4proc.c
nfs4recover.c	commit_metadata export operation replacing nfsd_sync_dir	2010-02-20 13:13:44 -08:00
nfs4state.c	Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux	2010-03-06 11:31:38 -08:00
nfs4xdr.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
nfscache.c
nfsctl.c	NFSD: Create PF_INET6 listener in write_ports	2010-01-27 17:01:08 -05:00
nfsd.h
nfsfh.c	nfsd: fix "insecure" export option	2009-12-20 20:19:51 -08:00
nfsfh.h
nfsproc.c
nfssvc.c
nfsxdr.c
state.h
stats.c
vfs.c	Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux	2010-03-06 11:31:38 -08:00
vfs.h
xdr3.h
xdr4.h
xdr.h