From e5984170277677d606ca48fe04043ac26e707002 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@googlemail.com>
Date: Mon, 5 Dec 2011 23:08:32 +0100
Subject: [PATCH] --- yaml --- r: 276575 b: refs/heads/master c:
 89e0b9a3fd66d72f2d7b7f2d6d86fa56997cde27 h: refs/heads/master i:   276573:
 ea43f4b627943234538c28c5be2cd9a614b93ef4   276571:
 36e7edecd1770a5c1f9b5cf410609cf257de4a99   276567:
 d98bb3e4f5184a73936166a77f9a2e28a2a8e0a8   276559:
 e9dc2df5fcbf4707a85808b92b4bdd026ec74127   276543:
 c946ee4ab03e6bf3c7b92435aaf65ef29f561e4a v: v3

---
 [refs]                                    | 2 +-
 trunk/Documentation/kernel-parameters.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aef6c8e44948..d9d97105740a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96f176a310e447966e45112fe4511b9d9fa0caf4
+refs/heads/master: 89e0b9a3fd66d72f2d7b7f2d6d86fa56997cde27
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index a0c5c5f4fce6..da5037766eed 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -320,7 +320,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 			on: enable for both 32- and 64-bit processes
 			off: disable for both 32- and 64-bit processes
 
-	amd_iommu=	[HW,X86-84]
+	amd_iommu=	[HW,X86-64]
 			Pass parameters to the AMD IOMMU driver in the system.
 			Possible values are:
 			fullflush - enable flushing of IO/TLB entries when