Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
authorDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2010 19:33:23 +0000 (11:33 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Dec 2010 19:33:23 +0000 (11:33 -0800)
1  2 
drivers/vhost/net.c

Simple merge