From: David S. Miller <davem@sunset.davemloft.net>
Date: Thu, 8 Feb 2007 23:25:18 +0000 (-0800)
Subject: Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.21-rc1~83^2~65^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6;p=linux-2.6

Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig
---

9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6
diff --cc crypto/Kconfig
index 918b4d845f,c2a85bd922..086fcec447
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -168,6 -196,21 +177,13 @@@ config CRYPTO_DE
  	help
  	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
  
 -config CRYPTO_DES_S390
 -	tristate "DES and Triple DES cipher algorithms (s390)"
 -	depends on S390
 -	select CRYPTO_ALGAPI
 -	select CRYPTO_BLKCIPHER
 -	help
 -	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 -
+ config CRYPTO_FCRYPT
+ 	tristate "FCrypt cipher algorithm"
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_BLKCIPHER
+ 	help
+ 	  FCrypt algorithm used by RxRPC.
+ 
  config CRYPTO_BLOWFISH
  	tristate "Blowfish cipher algorithm"
  	select CRYPTO_ALGAPI