Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 May 2010 07:26:49 +0000 (00:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 May 2010 07:26:49 +0000 (00:26 -0700)

Trivial merge