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

Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

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

2014-09-23 12:09:27 -04:00

..

Kconfig

net/xfrm: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:40:03 -08:00

Makefile

xfrm: make xfrm_algo.c a module

2012-05-15 13:13:34 -04:00

xfrm_algo.c

net: move pskb_put() to core code

2013-11-07 19:28:58 -05:00

xfrm_hash.c

net: allow GFP_HIGHMEM in __vmalloc()

2010-11-21 10:04:04 -08:00

xfrm_hash.h

net: misc: Remove extern from function prototypes

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

xfrm_input.c

xfrm: Introduce xfrm_input_afinfo to access the the callbacks properly

2014-03-14 07:28:07 +01:00

xfrm_ipcomp.c

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

2013-11-04 13:48:30 -05:00

xfrm_output.c

net: use kfree_skb_list() helper in more places

2014-09-09 20:10:45 -07:00

xfrm_policy.c

xfrm: Generate queueing routes only from route lookup functions

2014-09-16 10:08:49 +02:00

xfrm_proc.c

net: clean up snmp stats code

2014-05-07 16:06:05 -04:00

xfrm_replay.c

xfrm: Fix aevent generation for each received packet

2013-09-25 07:32:48 +02:00

xfrm_state.c

xfrm: Remove useless xfrm_audit struct.

2014-04-23 08:21:04 +02:00

xfrm_sysctl.c

net: Don't export sysctls to unprivileged users

2012-11-18 20:30:55 -05:00

xfrm_user.c

xfrm: Fix installation of AH IPsec SAs

2014-06-30 07:42:12 +02:00