David S. Miller 9783e1df7a Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6 ...

Conflicts:

	crypto/Kconfig

2007-02-08 15:25:18 -08:00

..

Kconfig

[PFKEYV2]: CONFIG_NET_KEY_MIGRATE option

2007-02-08 13:15:05 -08:00

Makefile

…

xfrm_algo.c

…

xfrm_hash.c

…

xfrm_hash.h

…

xfrm_input.c

…

xfrm_policy.c

[XFRM]: xfrm_migrate() needs exporting to modules.

2007-02-08 13:29:15 -08:00

xfrm_state.c

…

xfrm_user.c

[XFRM]: User interface for handling XFRM_MSG_MIGRATE

2007-02-08 13:12:32 -08:00