From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Aug 2012 05:21:57 +0000 (+1000)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20120822~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=577c8a447952af3f3945c818407150a35a992681;p=karo-tx-linux.git

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

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

577c8a447952af3f3945c818407150a35a992681