linux-sg2042/drivers/vhost
David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 00:53:17 -05:00
..
Kconfig vhost: Make vhost a separate module 2013-07-07 17:33:44 +03:00
Makefile vhost: Make vhost a separate module 2013-07-07 17:33:44 +03:00
net.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-15 00:53:17 -05:00
scsi.c vhost-scsi: Add missing virtio-scsi -> TCM attribute conversion 2015-01-06 13:46:29 -08:00
test.c vhost: move memory pointer to VQs 2014-06-09 16:21:07 +03:00
test.h vhost test module 2010-12-09 16:00:21 +02:00
vhost.c vhost: relax used address alignment 2014-12-29 10:55:06 +02:00
vhost.h vhost: remove unnecessary forward declarations in vhost.h 2014-12-09 12:06:33 +02:00
vringh.c vringh: update for virtio 1.0 APIs 2014-12-15 23:49:28 +02:00