Merge remote-tracking branch 'v9fs/for-next'

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

Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)

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

Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)
diff --cc fs/9p/v9fs.c
Simple merge
diff --cc net/9p/trans_fd.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 10 Oct 2012 22:51:19 +0000 (09:51 +1100)
		1	2
fs/9p/v9fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/9p/trans_fd.c	patch \|	diff1 \|	diff2 \|	blob \| history