Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Fri, 16 Jul 2010 19:41:44 +0000 (12:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Jul 2010 19:41:44 +0000 (12:41 -0700)

Trivial merge