From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 04:50:18 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvmtool/master'
X-Git-Tag: next-20110930~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8de4587017fb41d5d61ad331f864e980a838904d;p=karo-tx-linux.git

Merge remote-tracking branch 'kvmtool/master'

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

8de4587017fb41d5d61ad331f864e980a838904d