David S. Miller 296c10639a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next ...

Conflicts:
	net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

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

2013-11-02 02:13:48 -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: generalize batman-adv icmp packet handling

2013-10-23 17:03:47 +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

net, mc: fix the incorrect comments in two mc-related functions

2013-10-29 00:19:05 -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

6lowpan: cleanup skb copy data

2013-10-30 17:18:46 -04:00

ipv4

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-11-02 02:13:48 -04:00

ipv6

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-11-02 02:13:48 -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

6lowpan: set and use mac_len for mac header length

2013-10-30 17:18:46 -04:00

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

net: sched: cls_bpf: add BPF-based classifier

2013-10-29 17:33:17 -04:00

sctp

sctp: merge two if statements to one

2013-10-28 01:02:34 -04:00

sunrpc

…

tipc

tipc: remove two indentation levels in tipc_recv_msg routine

2013-10-30 16:54:54 -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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-11-02 02:13:48 -04:00

compat.c

…

Kconfig

…

Makefile

…

nonet.c

…

socket.c

…

sysctl_net.c

…