Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2010 15:26:36 +0000 (08:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Jun 2010 15:26:36 +0000 (08:26 -0700)
commit0dea7c12fc2c15de8b2104a322a1f47919d753fd
treef6f2082164d3a1fcfe3359d02beb6f19917d4c08
parentab95bfe01f9872459c8678572ccadbf646badad0
parentf8322fbe049687d3676690e8ad839c7169dd306a
Merge branch 'vhost-net-next' of git://git./linux/kernel/git/mst/vhost
drivers/vhost/net.c
drivers/vhost/vhost.c