From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 27 Sep 2012 05:41:23 +0000 (+1000)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20120927~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94ed1b20bfb587d2ec19b023e95e9e2c2f199342;p=karo-tx-linux.git

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

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

94ed1b20bfb587d2ec19b023e95e9e2c2f199342