From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Oct 2012 04:41:08 +0000 (+1100)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20121031~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=976ab189bcf5cf83dcce7f6b7a5acb3de7fedd0b;p=karo-tx-linux.git

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

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

976ab189bcf5cf83dcce7f6b7a5acb3de7fedd0b