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

Conflicts:

	crypto/Kconfig

diff --cc crypto/Kconfig
index 918b4d845f935ba5dfa4be45f88134716845a7e5,c2a85bd922b97b7da5fddc090599ce74f56608dc..086fcec44720cdd02f80b1539dac562caaea4476
--- 1/crypto/Kconfig
--- 2/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

diff --cc include/linux/pfkeyv2.h
Simple merge