Merge remote-tracking branch 'nfsd/nfsd-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
diff --cc fs/lockd/svc.c
Simple merge
diff --cc fs/locks.c
Simple merge
diff --cc fs/nfs/callback.c
Simple merge
diff --cc fs/nfsd/nfs4state.c
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
		1	2
fs/lockd/svc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/locks.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/callback.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4state.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	patch \|	diff1 \|	diff2 \|	blob \| history