Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
David S. Miller [Wed, 2 Jun 2010 15:26:36 +0000 (08:26 -0700)]
1  2 
drivers/vhost/net.c
drivers/vhost/vhost.c

Simple merge
Simple merge