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

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

Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)

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

Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)
diff --cc fs/lockd/svc.c
Simple merge
diff --cc fs/nfs/callback.c
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 3 Oct 2012 01:29:06 +0000 (11:29 +1000)
		1	2
fs/lockd/svc.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfs/callback.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	patch \|	diff1 \|	diff2 \|	blob \| history