David S. Miller 06c54055be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c net/bridge/br_multicast.c net/ipv6/sit.c The conflicts were minor: 1) sit.c changes overlap with change to ip_tunnel_xmit() signature. 2) br_multicast.c had an overlap between computing max_delay using msecs_to_jiffies and turning MLDV2_MRC() into an inline function with a name using lowercase instead of uppercase letters. 3) stmmac had two overlapping changes, one which conditionally allocated and hooked up a dma_cfg based upon the presence of the pbl OF property, and another one handling store-and-forward DMA made. The latter of which should not go into the new of_find_property() basic block. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-09-05 14:58:52 -04:00
..
Makefile
netxen_nic_ctx.c	ethernet: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:33 -05:00
netxen_nic_ethtool.c	drivers: ethernet: qlogic: netxen_nic_ethtool.c: Fixed a coding style issue	2012-11-06 17:41:42 -05:00
netxen_nic_hdr.h	netxen_nic: Avoid mixed mode interrupts	2013-05-30 16:52:37 -07:00
netxen_nic_hw.c	ethernet: Convert mac address uses of 6 to ETH_ALEN	2013-08-02 12:33:54 -07:00
netxen_nic_hw.h
netxen_nic_init.c	driver/qlogic: replace ip_fast_csum with csum_replace2	2013-03-15 09:12:24 -04:00
netxen_nic_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-09-05 14:58:52 -04:00
netxen_nic.h	netxen: lower NAPI weight	2013-08-27 14:59:27 -04:00