David S. Miller eb14f01959 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/net/e1000e/ich8lan.c

2008-12-15 20:03:50 -08:00

..

auth.c

…

auth.h

…

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

…

nfs2acl.c

…

nfs3acl.c

…

nfs3proc.c

…

nfs3xdr.c

…

nfs4acl.c

…

nfs4callback.c

nfsd: use nfs client rpc callback program

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

nfs4idmap.c

…

nfs4proc.c

nfsd: common grace period control

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

nfs4recover.c

nfsd: use of unitialized list head on error exit in nfs4recover.c

2008-11-24 10:36:09 -06:00

nfs4state.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2008-12-15 20:03:50 -08:00

nfs4xdr.c

nfsd: nfs4xdr decode_stateid helper function

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

nfscache.c

…

nfsctl.c

fs: replace NIPQUAD()

2008-10-31 00:56:28 -07:00

nfsfh.c

…

nfsproc.c

…

nfssvc.c

NFSD: Fix BUG during NFSD shutdown processing

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

nfsxdr.c

…

stats.c

…

vfs.c

Fix nfsd truncation of readdir results

2008-11-09 15:15:50 -05:00