From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Nov 2012 03:33:08 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20121108~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8229c06e2b25163540cc654aaa9e3800672d9889;p=karo-tx-linux.git

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

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

8229c06e2b25163540cc654aaa9e3800672d9889