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.

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/44x/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc kernel/irq/manage.c
Simple merge

diff --cc lib/Kconfig
index abff69d,32f3e5a..d971366
--- 1/lib/Kconfig
--- 2/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