Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2010 23:52:29 +0000 (16:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2010 23:52:29 +0000 (16:52 -0700)

Trivial merge