Merge branch 'quilt/kernel-doc'

diff --cc Documentation/kernel-parameters.txt
index 26a83743af19d3e3f46e309dd28f5af203f8b1c4,dc3f411d5d6d3a3d3ef4891b42affbf7367adc1c..895fea19aaf5d8fa976b738382273b6ae0dc10ad
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1157,8 -1159,12 +1159,8 @@@ bytes respectively. Such letter suffixe
  
        kvm-amd.npt=    [KVM,AMD] Disable nested paging (virtualized MMU)
                        for all guests.
-                       Default is 1 (enabled) if in 64bit or 32bit-PAE mode
+                       Default is 1 (enabled) if in 64-bit or 32-bit PAE mode.
  
 -      kvm-intel.bypass_guest_pf=
 -                      [KVM,Intel] Disables bypassing of guest page faults
 -                      on Intel chips. Default is 1 (enabled)
 -
        kvm-intel.ept=  [KVM,Intel] Disable extended page tables
                        (virtualized MMU) support on capable Intel chips.
                        Default is 1 (enabled)