Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
commitfea069152614cdeefba4b2bf80afcddb9c217fc8
tree97a4ca0c1afabe94b69110409a46347a093cff45
parent5f6c01819979afbfec7e0b15fe52371b8eed87e8
parenta8d3782f9ea7574b8648e69bbb05a0b1d93e437e
Merge branch 'vhost' of git://git./linux/kernel/git/mst/vhost
drivers/vhost/net.c
drivers/vhost/vhost.c