Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc patches from Andrew Morton:

 - the "misc" tree - stuff from all over the map

 - checkpatch updates

 - fatfs

 - kmod changes

 - procfs

 - cpumask

 - UML

 - kexec

 - mqueue

 - rapidio

 - pidns

 - some checkpoint-restore feature work.  Reluctantly.  Most of it
   delayed a release.  I'm still rather worried that we don't have a
   clear roadmap to completion for this work.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (78 patches)
  kconfig: update compression algorithm info
  c/r: prctl: add ability to set new mm_struct::exe_file
  c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
  c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
  syscalls, x86: add __NR_kcmp syscall
  fs, proc: introduce /proc/<pid>/task/<tid>/children entry
  sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
  aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
  eventfd: change int to __u64 in eventfd_signal()
  fs/nls: add Apple NLS
  pidns: make killed children autoreap
  pidns: use task_active_pid_ns in do_notify_parent
  rapidio/tsi721: add DMA engine support
  rapidio: add DMA engine support for RIO data transfers
  ipc/mqueue: add rbtree node caching support
  tools/selftests: add mq_perf_tests
  ipc/mqueue: strengthen checks on mqueue creation
  ipc/mqueue: correct mq_attr_ok test
  ipc/mqueue: improve performance of send/recv
  selftests: add mq_open_tests
  ...

1 files changed, 5 insertions, 6 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 1e004d057468..d07dcf9fc8a9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -167,7 +167,7 @@ config KERNEL_BZIP2
         depends on HAVE_KERNEL_BZIP2
         help
           Its compression ratio and speed is intermediate.
-          Decompression speed is slowest among the three.  The kernel
+          Decompression speed is slowest among the choices.  The kernel
           size is about 10% smaller with bzip2, in comparison to gzip.
           Bzip2 uses a large amount of memory. For modern kernels you
           will need at least 8MB RAM or more for booting.
@@ -176,10 +176,9 @@ config KERNEL_LZMA
         bool "LZMA"
         depends on HAVE_KERNEL_LZMA
         help
-          The most recent compression algorithm.
-          Its ratio is best, decompression speed is between the other
-          two. Compression is slowest.  The kernel size is about 33%
-          smaller with LZMA in comparison to gzip.
+          This compression algorithm's ratio is best.  Decompression speed
+          is between gzip and bzip2.  Compression is slowest.
+          The kernel size is about 33% smaller with LZMA in comparison to gzip.
 
 config KERNEL_XZ
         bool "XZ"
@@ -200,7 +199,7 @@ config KERNEL_LZO
         bool "LZO"
         depends on HAVE_KERNEL_LZO
         help
-          Its compression ratio is the poorest among the 4. The kernel
+          Its compression ratio is the poorest among the choices. The kernel
           size is about 10% bigger than gzip; however its speed
           (both compression and decompression) is the fastest.