From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 03:19:43 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20121030~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1baa8539c8a91fa014f0e33a6903296c17d836e2;p=karo-tx-linux.git

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

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

1baa8539c8a91fa014f0e33a6903296c17d836e2