David S. Miller 902455e007 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/core/rtnetlink.c net/core/skbuff.c Both conflicts were very simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-11 16:02:55 -07:00
..
appletalk
arcnet
bonding	bonding: Support macvlans on top of tlb/rlb mode bonds	2014-06-04 15:13:54 -07:00
caif
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
cris
dsa
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
fddi
hamradio
hippi
hyperv	hyperv: Add hash value into RNDIS Per-packet info	2014-05-23 14:49:00 -04:00
ieee802154	mrf24j40: add device managed APIs	2014-06-11 15:39:19 -07:00
irda	via-ircc: Remove useless return variables	2014-06-02 17:04:05 -07:00
phy	net: phy: realtek: register/unregister multiple drivers properly	2014-06-11 15:17:27 -07:00
plip
ppp	inetpeer: get rid of ip_id_count	2014-06-02 11:00:41 -07:00
slip
team	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
vmxnet3	net: use SPEED_UNKNOWN and DUPLEX_UNKNOWN when appropriate	2014-06-06 16:24:07 -07:00
wan	farsync: Fix confusion about DMA address and buffer offset types	2014-06-11 00:45:29 -07:00
wimax	net: wimax: i2400m: control.c: Cleaning up conjunction always evaluates to false	2014-06-11 00:13:16 -07:00
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-06-06 11:59:11 -04:00
xen-netback	net: xen-netback: include linux/vmalloc.h again	2014-06-11 15:19:28 -07:00
dummy.c
eql.c
ifb.c
Kconfig
LICENSE.SRC
loopback.c
macvlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-11 16:02:55 -07:00
macvtap.c
Makefile
mdio.c
mii.c
netconsole.c
nlmon.c
ntb_netdev.c	net: use ethtool_cmd_speed_set helper to set ethtool speed value	2014-06-06 16:24:07 -07:00
rionet.c
sb1000.c
Space.c
sungem_phy.c
tun.c	net-tun: restructure tun_do_read for better sleep/wakeup efficiency	2014-05-21 15:50:28 -04:00
veth.c
virtio_net.c
vxlan.c	net: Add skb_gro_postpull_rcsum to udp and vxlan	2014-06-11 15:46:13 -07:00
xen-netfront.c	xen-netfront: initialise queue name in xennet_init_queue	2014-06-04 14:48:17 -07:00