Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
authorDavid S. Miller <davem@davemloft.net>
Tue, 19 Jul 2011 17:12:44 +0000 (10:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Jul 2011 17:12:44 +0000 (10:12 -0700)

Trivial merge