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

Merge remote-tracking branch 'kvmtool/master'

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

0bb9d7ef9a36671044687844796a2f64803373a5