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

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 fs/namespace.c
Simple merge

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

diff --cc lib/Kconfig
index 32f3e5ae2be543c59ae3e50682ca504010eb87a3,abff69d4ff885c29cfee8382f61fa85356289084..d971366b8de20cb94bdf7746b5d1f97729857965
--- 1/lib/Kconfig
--- 2/lib/Kconfig
+++ b/lib/Kconfig
@@@ -270,10 -270,12 +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