Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 06:36:41 +0000 (23:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2011 06:36:41 +0000 (23:36 -0700)

Trivial merge