Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)
  Kconfig: acpi: Fix typo in comment.
  misc latin1 to utf8 conversions
  devres: Fix a typo in devm_kfree comment
  btrfs: free-space-cache.c: remove extra semicolon.
  fat: Spelling s/obsolate/obsolete/g
  SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
  tools/power turbostat: update fields in manpage
  mac80211: drop spelling fix
  types.h: fix comment spelling for 'architectures'
  typo fixes: aera -> area, exntension -> extension
  devices.txt: Fix typo of 'VMware'.
  sis900: Fix enum typo 'sis900_rx_bufer_status'
  decompress_bunzip2: remove invalid vi modeline
  treewide: Fix comment and string typo 'bufer'
  hyper-v: Update MAINTAINERS
  treewide: Fix typos in various parts of the kernel, and fix some comments.
  clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR
  gpio: Kconfig: drop unknown symbol 'CS5535_GPIO'
  leds: Kconfig: Fix typo 'D2NET_V2'
  sound: Kconfig: drop unknown symbol ARCH_CLPS7500
  ...

Fix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new
kconfig additions, close to removed commented-out old ones)

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/Kconfig b/lib/Kconfig
index 63b5782732ed..f34be6417d71 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -273,10 +273,9 @@ config AVERAGE
           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.
 
 endmenu