Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
David S. Miller [Fri, 23 Mar 2012 18:46:48 +0000 (14:46 -0400)]
1  2 
drivers/vhost/vhost.c

Simple merge