David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -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	xfrm: choose protocol family by skb protocol	2013-08-19 09:39:04 +02:00
xfrm_policy.c	flowcache: Fix resource leaks on namespace exit.	2014-03-12 15:31:18 -04:00
xfrm_proc.c	xfrm: checkpatch errors with space	2014-01-02 07:48:48 +01:00
xfrm_replay.c	xfrm: Fix aevent generation for each received packet	2013-09-25 07:32:48 +02:00
xfrm_state.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next	2014-03-18 14:09:07 -04:00
xfrm_sysctl.c	net: Don't export sysctls to unprivileged users	2012-11-18 20:30:55 -05:00
xfrm_user.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00