David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c drivers/net/ethernet/emulex/benet/be.h include/net/tcp.h net/mac802154/mac802154.h Most conflicts were minor overlapping stuff. The be2net driver brought in some fixes that added __vlan_put_tag calls, which in net-next take an additional argument. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-30 03:55:20 -04:00
..
bnx2x	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
Kconfig	…
Makefile	…
b44.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next	2013-02-22 10:07:30 +01:00
b44.h	…
bcm63xx_enet.c	drivers:net: dma_alloc_coherent: use __GFP_ZERO instead of memset(, 0)	2013-03-17 12:50:24 -04:00
bcm63xx_enet.h	…
bgmac.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
bgmac.h	bgmac: register MII bus	2013-03-07 16:28:26 -05:00
bnx2.c	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
bnx2.h	…
bnx2_fw.h	…
cnic.c	bnx2x, bnx2fc: Use per port max exchange resources	2013-04-25 04:06:46 -04:00
cnic.h	…
cnic_defs.h	…
cnic_if.h	bnx2x, bnx2fc: Use per port max exchange resources	2013-04-25 04:06:46 -04:00
sb1250-mac.c	drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb	2013-03-09 16:09:19 -05:00
tg3.c	tg3: shows HW time stamping support only if ptp_capable is present	2013-04-29 15:14:02 -04:00
tg3.h	tg3: Pull the phy advertised speed and flow control settings on driver load	2013-04-09 15:14:15 -04:00