From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 05:11:03 +0000 (+1000)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20120907~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2fd83e119431afd7acaee5af578f1b89b48760bf;p=karo-tx-linux.git

Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	drivers/net/tun.c
---

2fd83e119431afd7acaee5af578f1b89b48760bf