David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-08-30 00:54:02 -04:00

..

Makefile

vmxnet3: prepare for version 3 changes

2016-06-16 22:37:04 -07:00

upt1_defs.h

vmxnet3: prepare for version 3 changes

2016-06-16 22:37:04 -07:00

vmxnet3_defs.h

vmxnet3: introduce command to register memory region

2016-06-16 22:37:05 -07:00

vmxnet3_drv.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-30 00:54:02 -04:00

vmxnet3_ethtool.c

vmxnet3: add support for get_coalesce, set_coalesce ethtool operations

2016-06-16 22:37:04 -07:00

vmxnet3_int.h

vmxnet3: fix tx data ring copy for variable size

2016-08-19 22:44:22 -07:00