Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:41:47 +0000 (12:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:41:47 +0000 (12:41 -0800)

Trivial merge