From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Sep 2011 02:40:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'v9fs/for-next'
X-Git-Tag: next-20110912~72
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e22b4225d122c2341cbcac580b40d7261cbf990;p=karo-tx-linux.git

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

Conflicts:
	net/9p/trans_virtio.c
---

2e22b4225d122c2341cbcac580b40d7261cbf990