Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Mar 2012 18:46:48 +0000 (14:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Mar 2012 18:46:48 +0000 (14:46 -0400)

Trivial merge