Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

Conflicts:

	crypto/Kconfig

diff --combined crypto/Kconfig
index 07090e9,935301e..3d1a1e2
--- 1/crypto/Kconfig
--- 2/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -1,20 -1,8 +1,18 @@@
  #
 -# Cryptographic API Configuration
 +# Generic algorithms support
 +#
 +config XOR_BLOCKS
 +      tristate
 +
  #
 +# async_tx api: hardware offloaded memory transfer/transform support
 +#
 +source "crypto/async_tx/Kconfig"
  
- menu "Cryptographic options"
- 
- config CRYPTO
 +#
 +# Cryptographic API Configuration
 +#
+ menuconfig CRYPTO
        bool "Cryptographic API"
        help
          This option provides the core Cryptographic API.
@@@ -473,5 -461,3 +471,3 @@@ config CRYPTO_TES
  source "drivers/crypto/Kconfig"
  
  endif # if CRYPTO
- 
- endmenu