Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6

Pull documentation update from Jonathan Corbet:
 "Here's my set of accumulated documentation changes for 3.19.

  It includes a couple of additions to the coding style document, some
  fixes for minor build problems within the documentation tree, the
  relocation of the kselftest docs, and various tweaks and additions.

  A couple of changes reach outside of Documentation/; they only make
  trivial comment changes and I did my best to get the required acks.

  Complete with a shiny signed tag this time around"

* tag 'docs-for-linus' of git://git.lwn.net/linux-2.6:
  kobject: grammar fix
  Input: xpad - update docs to reflect current state
  Documentation: Build mic/mpssd only for x86_64
  cgroups: Documentation: fix wrong cgroupfs paths
  Documentation/email-clients.txt: add info about Claws Mail
  CodingStyle: add some more error handling guidelines
  kselftest: Move the docs to the Documentation dir
  Documentation: fix formatting to make 's' happy
  Documentation: power: Fix typo in Documentation/power
  Documentation: vm: Add 1GB large page support information
  ipv4: add kernel parameter tcpmhash_entries
  Documentation: Fix a typo in mailbox.txt
  treewide: Fix typo in Documentation/DocBook/device-drivers
  CodingStyle: Add a chapter on conditional compilation

diff --combined Documentation/kernel-parameters.txt
index eacb2e0397ae3f4e80428ef239d5b28faaf622b3,e8066db54d3d670f82cd5363332dd674e08d0243..43ecdcd39df23bf0189666907d91ba43024c78e7
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1446,9 -1446,6 +1446,9 @@@ bytes respectively. Such letter suffixe
                       disable
                         Do not enable intel_pstate as the default
                         scaling driver for the supported processors
 +                     no_hwp
 +                       Do not enable hardware P state control (HWP)
 +                       if available.
  
        intremap=       [X86-64, Intel-IOMMU]
                        on      enable Interrupt Remapping (default)
@@@ -2512,9 -2509,6 +2512,9 @@@
                        timeout < 0: reboot immediately
                        Format: <timeout>
  
 +      panic_on_warn   panic() instead of WARN().  Useful to cause kdump
 +                      on a WARN().
 +
        crash_kexec_post_notifiers
                        Run kdump after running panic-notifiers and dumping
                        kmsg. This only for the users who doubt kdump always
@@@ -2946,13 -2940,6 +2946,13 @@@
                        quiescent states.  Units are jiffies, minimum
                        value is one, and maximum value is HZ.
  
 +      rcutree.kthread_prio=    [KNL,BOOT]
 +                      Set the SCHED_FIFO priority of the RCU
 +                      per-CPU kthreads (rcuc/N). This value is also
 +                      used for the priority of the RCU boost threads
 +                      (rcub/N). Valid values are 1-99 and the default
 +                      is 1 (the least-favored priority).
 +
        rcutree.rcu_nocb_leader_stride= [KNL]
                        Set the number of NOCB kthread groups, which
                        defaults to the square root of the number of
@@@ -3102,15 -3089,6 +3102,15 @@@
                        messages.  Disable with a value less than or equal
                        to zero.
  
 +      rcupdate.rcu_self_test= [KNL]
 +                      Run the RCU early boot self tests
 +
 +      rcupdate.rcu_self_test_bh= [KNL]
 +                      Run the RCU bh early boot self tests
 +
 +      rcupdate.rcu_self_test_sched= [KNL]
 +                      Run the RCU sched early boot self tests
 +
        rdinit=         [KNL]
                        Format: <full_path>
                        Run specified binary instead of /init from the ramdisk,
@@@ -3434,6 -3412,13 +3434,13 @@@
                        neutralize any effect of /proc/sys/kernel/sysrq.
                        Useful for debugging.
  
+       tcpmhash_entries= [KNL,NET]
+                       Set the number of tcp_metrics_hash slots.
+                       Default value is 8192 or 16384 depending on total
+                       ram pages. This is used to specify the TCP metrics
+                       cache size. See Documentation/networking/ip-sysctl.txt
+                       "tcp_no_metrics_save" section for more details.
+ 
        tdfx=           [HW,DRM]
  
        test_suspend=   [SUSPEND][,N]
@@@ -3523,7 -3508,7 +3530,7 @@@
                        are saved.
  
        trace_buf_size=nn[KMG]
 -                      [FTRACE] will set tracing buffer size.
 +                      [FTRACE] will set tracing buffer size on each cpu.
  
        trace_event=[event-list]
                        [FTRACE] Set and start specified trace events in order
@@@ -3643,7 -3628,7 +3650,7 @@@
  
        usb-storage.delay_use=
                        [UMS] The delay in seconds before a new device is
 -                      scanned for Logical Units (default 5).
 +                      scanned for Logical Units (default 1).
  
        usb-storage.quirks=
                        [UMS] A list of quirks entries to supplement or