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
Makefile
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
test.h
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