From: David S. Miller <davem@sunset.davemloft.net>
Date: Sun, 15 Jul 2007 06:47:04 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.23-rc1~1054^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09f51b6997f3f443c5741bc696651e479576715;p=linux-2.6

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

Conflicts:

	crypto/Kconfig
---

d09f51b6997f3f443c5741bc696651e479576715
diff --cc crypto/Kconfig
index 07090e9f9b,935301ee5a..3d1a1e2794
--- a/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"
  
 +#
 +# Cryptographic API Configuration
 +#
- menu "Cryptographic options"
- 
- config CRYPTO
+ menuconfig CRYPTO
  	bool "Cryptographic API"
  	help
  	  This option provides the core Cryptographic API.