Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Mon, 27 Sep 2010 22:04:23 +0000 (15:04 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 27 Sep 2010 22:04:23 +0000 (15:04 -0700)

Trivial merge