linux_dsm_epyc7002/drivers/net/ethernet/broadcom
Jiri Kosina 617677295b Merge branch 'master' into for-next
Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
2013-01-29 10:48:30 +01:00
..
bnx2x Merge branch 'master' into for-next 2013-01-29 10:48:30 +01:00
b44.c drivers/net: fix up function prototypes after __dev* removals 2012-12-07 14:22:22 -05:00
b44.h b44: add 64 bit stats 2012-07-18 09:29:43 -07:00
bcm63xx_enet.c net/broadcom: remove __dev* attributes 2012-12-03 11:17:07 -08: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 broadcom: Move the Broadcom drivers 2011-08-10 19:54:39 -07:00
bnx2.c bnx2: Fix accidental reversions. 2012-12-11 21:28:25 -05:00
bnx2.h cnic, bnx2x, bnx2: Simplify cnic probing. 2012-12-07 12:44:02 -05:00
cnic_defs.h bnx2x,cnic: use FW 7.8.2 2012-10-01 16:43:17 -04:00
cnic_if.h cnic, bnx2x, bnx2: Simplify cnic probing. 2012-12-07 12:44:02 -05:00
cnic.c cnic, bnx2x, bnx2: Simplify cnic probing. 2012-12-07 12:44:02 -05:00
cnic.h cnic: Include bnx2x.h 2012-12-07 12:44:02 -05:00
Kconfig tg3: PTP - Add header definitions, initialization and hw access functions. 2012-12-04 12:58:49 -05:00
Makefile broadcom: Move the Broadcom drivers 2011-08-10 19:54:39 -07:00
sb1250-mac.c net/broadcom: remove __dev* attributes 2012-12-03 11:17:07 -08:00
tg3.c tg3: Fix crc errors on jumbo frame receive 2013-01-14 22:09:29 -05:00
tg3.h tg3: PTP - Add header definitions, initialization and hw access functions. 2012-12-04 12:58:49 -05:00