From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 07:33:53 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvmtool/master'
X-Git-Tag: next-20111004~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f37235514885ec56320d6197a52d25891f22cbb;p=karo-tx-linux.git

Merge remote-tracking branch 'kvmtool/master'

Conflicts:
	include/net/9p/9p.h
---

8f37235514885ec56320d6197a52d25891f22cbb