David S. Miller 2198a10b50 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/core/dev.c		2010-10-21 08:43:05 -07:00
..
Kconfig	net/macvtap: add vhost support	2010-02-18 14:08:38 -08:00
Makefile
net.c	vhost: max s/g to match qemu	2010-10-05 13:33:43 +02:00
vhost.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-10-21 08:43:05 -07:00
vhost.h	vhost: max s/g to match qemu	2010-10-05 13:33:43 +02:00