David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2016-07-06 10:35:22 -07:00

..

appletalk

treewide: replace dev->trans_start update with helper

2016-05-04 14:16:49 -04:00

arcnet

arcnet: com90xx: add __init attribute

2016-04-19 20:17:45 -04:00

bonding

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-07-06 10:35:22 -07:00

caif

…

can

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-06-30 05:03:36 -04:00

cris

treewide: replace dev->trans_start update with helper

2016-05-04 14:16:49 -04:00

dsa

dsa: b53: avoid 'maybe-uninitialized' warning

2016-06-29 05:07:12 -04:00

ethernet

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-07-06 10:35:22 -07:00

fddi

net: skfb: remove obsolete -I cflag

2016-06-15 22:06:06 -07:00

fjes

net: fjes: fjes_main: Remove create_workqueue

2016-06-03 19:29:42 -04:00

hamradio

hamradio: baycom: fix old-style declaration

2016-06-16 22:06:30 -07:00

hippi

…

hyperv

netvsc: get rid of completion timeouts

2016-06-09 11:40:05 -07:00

ieee802154

net: ieee802154/adf7242: syntax error ifdef DEBUG

2016-05-19 11:30:56 -07:00

ipvlan

net: ipvlan: call netdev_lockdep_set_classes()

2016-06-09 13:28:37 -07:00

irda

net: irda: avoid null pointer dereference

2016-05-19 11:30:57 -07:00

phy

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-07-06 10:35:22 -07:00

plip

…

ppp

net: add netdev_lockdep_set_classes() helper

2016-06-09 13:28:37 -07:00

slip

treewide: replace dev->trans_start update with helper

2016-05-04 14:16:49 -04:00

team

net: introduce default neigh_construct/destroy ndo calls for L2 upper devices

2016-07-05 09:06:28 -07:00

usb

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-07-06 10:35:22 -07:00

vmxnet3

vmxnet3: update to version 3

2016-06-16 22:37:05 -07:00

wan

Maxim/driver: Add driver for maxim ds26522

2016-06-29 04:05:14 -04:00

wimax

treewide: replace dev->trans_start update with helper

2016-05-04 14:16:49 -04:00

wireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-06-30 05:03:36 -04:00

xen-netback

xen-netback: only deinitialized hash if it was initialized

2016-05-20 17:41:18 -04:00

dummy.c

…

eql.c

…

geneve.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-07-06 10:35:22 -07:00

gtp.c

gtp: remove unused including <linux/version.h>

2016-06-17 22:28:49 -07:00

ifb.c

ifb: support more features

2016-05-09 00:00:28 -04:00

Kconfig

gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)

2016-05-10 12:25:04 -04:00

LICENSE.SRC

…

loopback.c

loopback: make use of NETIF_F_GSO_SOFTWARE

2016-06-03 19:37:21 -04:00

macsec.c

macsec: set actual real device for xmit when !protect_frames

2016-07-01 16:35:56 -04:00

macvlan.c

net: macvlan: call netdev_lockdep_set_classes()

2016-06-09 13:28:37 -07:00

macvtap.c

macvtap: use common code for virtio_net_hdr and skb GSO conversion

2016-06-10 23:03:55 -07:00

Makefile

gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)

2016-05-10 12:25:04 -04:00

mdio.c

…

mii.c

…

netconsole.c

…

nlmon.c

…

ntb_netdev.c

…

rionet.c

drivers: net: remove NETDEV_TX_LOCKED

2016-04-26 15:53:05 -04:00

sb1000.c

…

Space.c

net: Fix coding style warnings and errors.

2016-05-19 11:48:27 -07:00

sungem_phy.c

…

tun.c

tun: fix build warnings

2016-07-04 17:19:27 -07:00

veth.c

veth: Update features to include all tunnel GSO types

2016-04-21 14:14:59 -04:00

virtio_net.c

virtio_net: fix csum generation for virtio-net devices

2016-06-14 03:03:34 -04:00

vrf.c

net: vrf: Add support for PREROUTING rules on vrf device

2016-07-05 11:50:05 -07:00

vxlan.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-06-30 05:03:36 -04:00

xen-netfront.c

…