From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Oct 2012 01:27:12 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20121016~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dfd846643a6ff46993c9017935332a9a1b3d2f1d;p=karo-tx-linux.git

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

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

dfd846643a6ff46993c9017935332a9a1b3d2f1d