linux/drivers/net/ethernet/neterion/vxge
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
Makefile
vxge-config.c vxge: ensure data0 is initialized in when fetching firmware version information 2018-12-18 22:00:40 -08:00
vxge-config.h net: neterion: vxge: Use linux/io-64-nonatomic-lo-hi.h 2018-09-18 20:06:23 -07:00
vxge-ethtool.c net: vxge: fix spelling mistake in macro VXGE_HW_ERR_PRIVILAGED_OPEARATION 2018-05-23 14:50:02 -04:00
vxge-ethtool.h vxge: Add const to ethtool_driver_stats_keys 2015-04-01 15:35:14 -04:00
vxge-main.c treewide: kzalloc() -> kcalloc() 2018-06-12 16:19:22 -07:00
vxge-main.h net: vxge: Convert timers to use timer_setup() 2017-10-18 12:39:38 +01:00
vxge-reg.h
vxge-traffic.c net: neterion: vxge: remove set but not used variables 'max_frags' and 'txdl_priv' 2018-11-28 11:08:43 -08:00
vxge-traffic.h vxge: make local functions static 2014-01-16 16:22:54 -08:00
vxge-version.h