Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
authorDavid S. Miller <davem@davemloft.net>
Sun, 20 Mar 2011 21:35:09 +0000 (14:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Mar 2011 21:35:09 +0000 (14:35 -0700)

Trivial merge