Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 08:08:39 +0000 (01:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Oct 2010 08:08:39 +0000 (01:08 -0700)

Trivial merge