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
Makefile
xfrm_algo.c
xfrm_hash.c
xfrm_hash.h
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
xfrm_output.c
xfrm_policy.c	flowcache: Fix resource leaks on namespace exit.	2014-03-12 15:31:18 -04:00
xfrm_proc.c
xfrm_replay.c
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
xfrm_user.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00