David S. Miller 85dcce7a73 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c drivers/net/xen-netback/netback.c Both the r8152 and netback conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-14 22:31:55 -04:00
..
appletalk
arcnet
bonding	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
caif	caif: delete unnecessary field initialization	2014-02-17 00:29:23 -05:00
can	can: add bittiming check at interface open for CAN FD	2014-03-07 09:18:23 +01:00
cris
dsa
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
fddi
hamradio
hippi
hyperv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
ieee802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
irda	irtty-sir.c: Do not set_termios() on irtty_close()	2014-02-17 16:27:51 -05:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
plip
ppp
slip
team	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
vmxnet3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
wan	wan: dlci: Remove unused netdev_priv pointer	2014-02-09 18:40:56 -08:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
xen-netback	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
dummy.c	net: introduce netdev_alloc_pcpu_stats() for drivers	2014-02-14 15:49:55 -05:00
eql.c
ifb.c
Kconfig	net: fix macvtap type name in Kconfig	2014-02-13 15:48:31 -05:00
LICENSE.SRC
loopback.c	loopback: sctp: add NETIF_F_SCTP_CSUM to device features	2014-02-24 19:00:08 -05:00
macvlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
macvtap.c
Makefile
mdio.c
mii.c
netconsole.c
nlmon.c	net: introduce netdev_alloc_pcpu_stats() for drivers	2014-02-14 15:49:55 -05:00
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tun.c	tun: remove bogus hardware vlan acceleration flags from vlan_features	2014-02-20 02:15:38 -05:00
veth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
virtio_net.c	virtio-net: alloc big buffers also when guest can receive UFO	2014-02-24 18:19:52 -05:00
vxlan.c	vxlan: remove unused port variable in vxlan_udp_encap_recv()	2014-02-26 15:46:25 -05:00
xen-netfront.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00