David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
bnx2x	net: bnx2x calls skb_set_hash	2013-12-18 15:00:52 -05:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-08-12 14:45:06 -04:00
Makefile	bgmac: driver for GBit MAC core on BCMA bus	2013-01-09 23:37:03 -08:00
b44.c	Merge branch 'for-linus-dma-masks' of git://git.linaro.org/people/rmk/linux-arm	2013-11-14 07:55:21 +09:00
b44.h	b44: add 64 bit stats	2012-07-18 09:29:43 -07:00
bcm63xx_enet.c	bcm63xx_enet: remove deprecated IRQF_DISABLED	2013-09-11 16:09:58 -04:00
bcm63xx_enet.h	bcm63xx_enet: add support Broadcom BCM6345 Ethernet	2013-06-13 17:22:08 -07:00
bgmac.c	bgmac: replace some magic values with defines	2013-12-11 13:40:48 -05:00
bgmac.h	bgmac: replace some magic values with defines	2013-12-11 13:40:48 -05:00
bnx2.c	net: bnx2 calls skb_set_hash	2013-12-18 15:00:51 -05:00
bnx2.h	bnx2: Update version to 2.2.4	2013-08-07 10:44:08 -07:00
bnx2_fw.h	…
cnic.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04:00
cnic.h	cnic: Eliminate local copy of pfid.	2013-09-04 00:27:26 -04:00
cnic_defs.h	cnic: Update version to 2.5.17 and copyright year.	2013-07-29 22:03:07 -07:00
cnic_if.h	broadcom: Remove extern from function prototypes	2013-09-24 10:09:27 -04:00
sb1250-mac.c	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
tg3.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
tg3.h	tg3: Fix bit definition for the nvram Auto Power Down setting	2013-12-06 15:10:53 -05:00