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
..
appletalk	…
arcnet	…
bonding	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
cris	…
dsa	…
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
fddi	…
hamradio	…
hippi	…
hyperv	hyperv: Fix a compiler warning in netvsc_send()	2013-04-29 14:06:32 -04:00
ieee802154	at86rf230: change irq handling to prevent lockups with edge type irq	2013-04-16 16:34:08 -04:00
irda	…
phy	…
plip	…
ppp	…
slip	…
team	net: vlan: prepare for 802.1ad VLAN filtering offload	2013-04-19 14:45:27 -04:00
usb	drivers: net: usb: pegasus: fix control urb submission	2013-04-29 13:57:50 -04:00
vmxnet3	net: vlan: add protocol argument to packet tagging functions	2013-04-19 14:46:06 -04:00
wan	…
wimax	…
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-29 15:31:57 -04:00
xen-netback	xen-netback: don't disconnect frontend when seeing oversize packet	2013-04-22 15:37:01 -04:00
Kconfig	…
LICENSE.SRC	…
Makefile	…
Space.c	…
dummy.c	…
eql.c	…
ifb.c	net: vlan: announce STAG offload capability in some drivers	2013-04-19 14:46:06 -04:00
loopback.c	…
macvlan.c	net: vlan: announce STAG offload capability in some drivers	2013-04-19 14:46:06 -04:00
macvtap.c	…
mdio.c	…
mii.c	…
netconsole.c	…
ntb_netdev.c	…
rionet.c	…
sb1000.c	…
sungem_phy.c	…
tun.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
veth.c	net: vlan: announce STAG offload capability in some drivers	2013-04-19 14:46:06 -04:00
virtio_net.c	net: vlan: prepare for 802.1ad VLAN filtering offload	2013-04-19 14:45:27 -04:00
vxlan.c	vxlan: do not set SKB_GSO_UDP	2013-04-29 15:27:47 -04:00
xen-netfront.c	xen-netfront: reduce gso_max_size to account for max TCP header	2013-04-22 15:37:01 -04:00