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
..
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	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05: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	netxen: Delete an unnecessary check before the function call "kfree"	2015-02-05 00:26:23 -08:00
netxen_nic.h	netxen_nic: Fix trivial typos in comments	2015-03-01 13:40:22 -05:00