From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 13 Nov 2011 19:55:35 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.3-rc1~165^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2290c0d06d82faee87b1ab2d9d4f7bf81ef64379;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.
---

2290c0d06d82faee87b1ab2d9d4f7bf81ef64379
diff --cc lib/Kconfig
index abff69d4ff885,32f3e5ae2be54..d971366b8de20
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -270,12 -270,10 +270,9 @@@ 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 LLIST
- 	bool
- 
  endmenu