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

Conflicts:
	net/bluetooth/l2cap_core.c

Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.

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

2011-12-23 17:13:56 -05:00

..

Kconfig

…

Makefile

…

xfrm_algo.c

…

xfrm_hash.c

…

xfrm_hash.h

…

xfrm_input.c

…

xfrm_ipcomp.c

…

xfrm_output.c

…

xfrm_policy.c

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

2011-12-23 17:13:56 -05:00

xfrm_proc.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm_replay.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm_state.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

xfrm_sysctl.c

…

xfrm_user.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00