David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
Kconfig
Makefile
net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
scsi.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2015-02-21 13:21:19 -08:00
test.c	vhost: move memory pointer to VQs	2014-06-09 16:21:07 +03:00
test.h
vhost.c	vhost: switch vhost get_indirect() to iov_iter, kill memcpy_fromiovec()	2015-02-04 01:34:15 -05: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