Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Sun, 28 Nov 2010 19:27:44 +0000 (11:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Nov 2010 19:27:44 +0000 (11:27 -0800)

Trivial merge