David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
Makefile	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
netxen_nic_ctx.c	qlogic: use pci_zalloc_consistent	2014-08-08 15:57:29 -07:00
netxen_nic_ethtool.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
netxen_nic_hdr.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
netxen_nic_hw.c	netxen: reversed condition in netxen_nic_set_link_parameters()	2016-05-07 15:15:32 -04:00
netxen_nic_hw.h	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
netxen_nic_init.c	netxen_nic: use spin_[un]lock_bh around tx_clean_lock (2)	2015-05-09 16:44:46 -04:00
netxen_nic_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
netxen_nic.h	netxen_nic: Fix trivial typos in comments	2015-03-01 13:40:22 -05:00