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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

2013-10-23 16:49:34 -04:00

..

9p

…

802

…

8021q

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

appletalk

…

atm

…

ax25

…

batman-adv

batman-adv: make the backbone gw check VLAN specific

2013-10-19 23:25:38 +02:00

bluetooth

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

bridge

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

2013-10-23 16:49:34 -04:00

caif

…

can

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

ceph

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

core

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

2013-10-23 16:49:34 -04:00

dcb

…

dccp

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

decnet

…

dns_resolver

…

dsa

…

ethernet

…

ieee802154

…

ipv4

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

2013-10-23 16:49:34 -04:00

ipv6

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

2013-10-23 16:49:34 -04:00

ipx

…

irda

net: misc: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

iucv

…

key

…

l2tp

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

2013-10-23 16:49:34 -04:00

lapb

…

llc

…

mac80211

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

2013-10-23 16:49:34 -04:00

mac802154

…

mpls

ipip: add GSO/TSO support

2013-10-19 19:36:19 -04:00

netfilter

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

2013-10-23 16:49:34 -04:00

netlabel

…

netlink

…

netrom

…

nfc

…

openvswitch

…

packet

…

phonet

…

rds

inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once

2013-10-19 19:45:35 -04:00

rfkill

…

rose

…

rxrpc

net: misc: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

sched

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

2013-10-23 16:49:34 -04:00

sctp

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

2013-10-23 16:49:34 -04:00

sunrpc

…

tipc

net: misc: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

unix

net: unix: inherit SOCK_PASS{CRED, SEC} flags from socket to fix race

2013-10-19 18:50:15 -04:00

vmw_vsock

…

wimax

net: misc: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

wireless

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

2013-10-23 16:49:34 -04:00

x25

…

xfrm

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

2013-10-23 16:49:34 -04:00

compat.c

…

Kconfig

…

Makefile

…

nonet.c

…

socket.c

…

sysctl_net.c

…