Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Mon, 20 Sep 2010 18:13:34 +0000 (11:13 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Sep 2010 18:13:34 +0000 (11:13 -0700)

Trivial merge