Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

author David S. Miller <davem@davemloft.net>

Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)

committer David S. Miller <davem@davemloft.net>

Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
author David S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
committer David S. Miller <davem@davemloft.net>
Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
diff --cc drivers/vhost/net.c
Simple merge
diff --cc drivers/vhost/vhost.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 15 Apr 2010 05:52:46 +0000 (22:52 -0700)
		1	2
drivers/vhost/net.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/vhost/vhost.c	patch \|	diff1 \|	diff2 \|	blob \| history