David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c Minor conflict between the BCM_CNIC define removal in net-next and a bug fix added to net. Based upon a conflict resolution patch posted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-11-10 18:32:51 -05:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-11-10 18:32:51 -05:00
b44.c	b44: add 64 bit stats	2012-07-18 09:29:43 -07:00
b44.h	b44: add 64 bit stats	2012-07-18 09:29:43 -07:00
bcm63xx_enet.c	bcm63xx-enet: fix PHY name to match MDIO bus name	2012-02-13 16:04:08 -05:00
bcm63xx_enet.h	MIPS: BCM63XX: Move DMA descriptor definition into common header file	2012-08-30 20:15:52 +02:00
bnx2_fw.h
bnx2.c	PCI changes for the 3.7 merge window:	2012-10-01 12:05:36 -07:00
bnx2.h	bnx2: Read PCI function number from internal register	2012-06-16 22:22:59 -07:00
cnic_defs.h	bnx2x,cnic: use FW 7.8.2	2012-10-01 16:43:17 -04:00
cnic_if.h	bnx2x,cnic: use FW 7.8.2	2012-10-01 16:43:17 -04:00
cnic.c	bnx2x,cnic: use FW 7.8.2	2012-10-01 16:43:17 -04:00
cnic.h	cnic: Allocate kcq resource only on devices that support FCoE.	2012-09-10 15:48:21 -04:00
Kconfig	tg3: unconditionally select HWMON support when tg3 is enabled.	2012-10-01 18:07:39 -04:00
Makefile
sb1250-mac.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
tg3.c	tg3: Call tg3_netif_stop() from tg3_stop()	2012-11-06 19:00:14 -05:00
tg3.h	tg3: Support 5717 C0	2012-11-06 19:00:14 -05:00