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

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

Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)

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

Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Dec 2011 00:52:00 +0000 (11:52 +1100)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history