David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-23 16:49:34 -04:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -04:00
b44.c	net:drivers/net: Miscellaneous conversions to ETH_ALEN	2013-10-02 17:04:45 -04: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: add support for Byte Queue Limits	2013-09-30 22:08:55 -07:00
bgmac.h	bgmac: implement unaligned addressing for DMA rings that support it	2013-09-16 21:30:59 -04:00
bnx2.c	net: bnx2: remove unnecessary pci_set_drvdata()	2013-10-18 00:03:29 -04: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
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
sb1250-mac.c	net: ethernet: use platform_{get,set}_drvdata()	2013-05-25 21:27:58 -07:00
tg3.c	net: tg3: remove unnecessary pci_set_drvdata()	2013-10-18 00:03:29 -04:00
tg3.h	tg3: Add support for new 577xx device ids	2013-09-21 14:04:52 -04:00