From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Aug 2011 01:29:47 +0000 (+1000)
Subject: Merge branch 'quilt/kernel-doc'
X-Git-Tag: next-20110805~37
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=471d81248332f1a59093f026f8d429ef828e78c7;p=karo-tx-linux.git

Merge branch 'quilt/kernel-doc'
---

471d81248332f1a59093f026f8d429ef828e78c7
diff --cc Documentation/kernel-parameters.txt
index e279b7242912,dc3f411d5d6d..ff8bf0be89de
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -1165,8 -1159,12 +1167,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)