David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

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

2014-07-22 00:44:59 -07:00

..

appletalk

…

arcnet

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

bonding

bonding: make it possible to have unlimited nested upper vlans

2014-07-20 20:35:00 -07:00

caif

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

can

Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux-can-next

2014-07-15 17:39:39 -07:00

cris

eth_v10: remove unnecessary break after return

2014-07-20 21:29:49 -07:00

dsa

…

ethernet

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

2014-07-22 00:44:59 -07:00

fddi

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

2014-07-16 14:09:34 -07:00

hamradio

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

hippi

…

hyperv

hyperv: Add netpoll support

2014-07-09 16:52:49 -07:00

ieee802154

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

irda

drivers/net/irda/kingsun-sir.c: remove null test before kfree

2014-06-19 21:26:06 -07:00

phy

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

2014-07-16 14:09:34 -07:00

plip

…

ppp

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

2014-07-22 00:44:59 -07:00

slip

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

team

…

usb

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

2014-07-22 00:44:59 -07:00

vmxnet3

vmxnet3: adjust ring sizes when interface is down

2014-06-16 21:26:40 -07:00

wan

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

2014-07-22 00:44:59 -07:00

wimax

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

wireless

carl9170: remove unnecessary break after return

2014-07-20 21:29:51 -07:00

xen-netback

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

2014-07-22 00:44:59 -07:00

dummy.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

eql.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

ifb.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

Kconfig

vxlan: Call udp_sock_create

2014-07-14 16:12:15 -07:00

LICENSE.SRC

…

loopback.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

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

…

rionet.c

…

sb1000.c

…

Space.c

…

sungem_phy.c

…

tun.c

net: set name_assign_type in alloc_netdev()

2014-07-15 16:12:48 -07:00

veth.c

net: rtnetlink - make create_link take name_assign_type

2014-07-15 16:13:07 -07:00

virtio_net.c

…

vxlan.c

vxlan: Call udp_sock_create

2014-07-14 16:12:15 -07:00

xen-netfront.c

xen-netfront: call netif_carrier_off() only once when disconnecting

2014-07-08 11:21:03 -07:00