From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 06:29:30 +0000 (+1100)
Subject: Merge remote-tracking branch 'kvmtool/master'
X-Git-Tag: next-20111012~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f8e00d6b604bac796bd61992e5bb7b323d66965b;p=karo-tx-linux.git

Merge remote-tracking branch 'kvmtool/master'

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

f8e00d6b604bac796bd61992e5bb7b323d66965b