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

Merge remote-tracking branch 'kvmtool/master'

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

53c998adb615ddc8b73d52b97bb45807b1f4dd5e