From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 28 Nov 2011 03:09:15 +0000 (+1100)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20111128~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a843e3105ab0844b9f553d3e630ff6309753d06;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'
---

9a843e3105ab0844b9f553d3e630ff6309753d06
diff --cc lib/Kconfig
index 5634e473ff6d,d971366b8de2..b50d54f53e32
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -270,35 -270,9 +270,34 @@@ config AVERAG
  	  If unsure, say N.
  
  config CORDIC
- 	tristate "Cordic function"
+ 	tristate "CORDIC algorithm"
  	help
- 	  The option provides arithmetic function using cordic algorithm
- 	  so its calculations are in fixed point. Modules can select this
- 	  when they require this function. Module will be called cordic.
+ 	  This option provides an implementation of the CORDIC algorithm;
+ 	  calculations are in fixed point. Module will be called cordic.
  
 +config MPILIB
 +	tristate "Multiprecision maths library"
 +	help
 +	  Multiprecision maths library from GnuPG.
 +	  It is used to implement RSA digital signature verification,
 +	  which is used by IMA/EVM digital signature extension.
 +
 +config MPILIB_EXTRA
 +	bool "Multiprecision maths library - additional sources"
 +	depends on MPILIB
 +	help
 +	  Multiprecision maths library from GnuPG.
 +	  It is used to implement RSA digital signature verification,
 +	  which is used by IMA/EVM digital signature extension.
 +	  This code in unnecessary for RSA digital signature verification,
 +	  and can be compiled if needed.
 +
 +config DIGSIG
 +	tristate "In-kernel signature checker"
 +	depends on KEYS
 +	select MPILIB
 +	help
 +	  Digital signature verification. Currently only RSA is supported.
 +	  Implementation is done using GnuPG MPI library
 +
  endmenu