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

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

Revert "nfsd4: fix error return when pseudoroot missing"

2010-02-08 15:25:23 -05: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

knfsd: trivial makefile cleanup

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

nfs2acl.c

nfsd: remove pointless paths in file headers

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

nfs3acl.c

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -05: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

nfsd: remove pointless paths in file headers

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

nfs4callback.c

nfsd4: fix minor memory leak

2010-03-03 16:13:29 -05:00

nfs4idmap.c

nfsd: remove pointless paths in file headers

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

nfs4proc.c

nfsd: remove pointless paths in file headers

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

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

nfsd: remove pointless paths in file headers

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

nfsctl.c

NFSD: Create PF_INET6 listener in write_ports

2010-01-27 17:01:08 -05:00

nfsd.h

nfsd: remove pointless paths in file headers

2009-12-15 15:01:47 -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

nfsd: remove pointless paths in file headers

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

stats.c

nfsd: remove pointless paths in file headers

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

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

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

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

xdr3.h

nfsd: remove pointless paths in file headers

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

xdr4.h

nfsd: remove pointless paths in file headers

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

xdr.h

nfsd: remove pointless paths in file headers

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