linux_dsm_epyc7002/drivers/net/ethernet/qlogic/netxen
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08: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 ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_hdr.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00
netxen_nic_hw.c treewide: Fix typo in printk 2014-08-26 09:35:54 +02: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: Fix bug in Tx completion path. 2014-09-30 16:22:44 -04:00
netxen_nic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
netxen_nic.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00