Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Tue, 1 Feb 2011 20:56:11 +0000 (12:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 1 Feb 2011 20:56:11 +0000 (12:56 -0800)

Trivial merge