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

Trivial merge