leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
739e4a758e
linux/drivers/net/ethernet/qlogic/netxen
History
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-10-02 11:25:43 -07: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 net: netxen: slight optimization of addr compare 2013-12-31 16:48:32 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-10-02 11:25:43 -07:00
netxen_nic.h ethernet: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00