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

Trivial merge