kernel_optimize_test/net/xfrm
David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 17:01:28 +00:00
..
Kconfig [XFRM] POLICY: Add Kconfig to support sub policy. 2006-09-22 15:08:33 -07:00
Makefile [XFRM]: Extract common hashing code into xfrm_hash.[ch] 2006-09-22 15:08:49 -07:00
xfrm_algo.c [CRYPTO] users: Use crypto_comp and crypto_has_* 2006-09-21 11:46:22 +10:00
xfrm_hash.c [XFRM]: Extract common hashing code into xfrm_hash.[ch] 2006-09-22 15:08:49 -07:00
xfrm_hash.h [XFRM] STATE: Use destination address for src hash. 2006-10-04 00:31:02 -07:00
xfrm_input.c [XFRM]: xfrm_parse_spi() annotations 2006-09-28 18:02:39 -07:00
xfrm_policy.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
xfrm_state.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
xfrm_user.c [XFRM] xfrm_user: Better validation of user templates. 2006-12-03 19:19:26 -08:00