From a13ffbe0369010a4795b3d30fd102b60753a8942 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 8 Dec 2008 14:25:39 +0100
Subject: [PATCH] --- yaml --- r: 119743 b: refs/heads/master c:
 24f811603e8ef4b9173f47fa263230168e237128 h: refs/heads/master i:   119741:
 c378b26deb11cbd3392768ebfbb9fbd15eb3c060   119739:
 6e41ece478dfff7d6c215b682d805bb5e51feb88   119735:
 720bcfeb58ff206b09c2bdcd1c56626a9b5412b6   119727:
 f8796a187ecd7ca50f25b4660aedd279eca4d6ab   119711:
 88221f033aff4f19e21b49374df8b0ee5619c31e   119679:
 056b0be904f9bf367402bf698c60eb6f66aaaa70 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/kernel/amd_iommu.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cf2d9118b5a2..6b746ca1d3b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cc3d84bffbd93bdb671ac7961b12cd98fbb9266
+refs/heads/master: 24f811603e8ef4b9173f47fa263230168e237128
diff --git a/trunk/arch/x86/kernel/amd_iommu.c b/trunk/arch/x86/kernel/amd_iommu.c
index 0637e65ca0c7..2fde073b6be6 100644
--- a/trunk/arch/x86/kernel/amd_iommu.c
+++ b/trunk/arch/x86/kernel/amd_iommu.c
@@ -922,8 +922,8 @@ static void dma_ops_domain_unmap(struct amd_iommu *iommu,
 
 /*
  * This function contains common code for mapping of a physically
- * contiguous memory region into DMA address space. It is uses by all
- * mapping functions provided by this IOMMU driver.
+ * contiguous memory region into DMA address space. It is used by all
+ * mapping functions provided with this IOMMU driver.
  * Must be called with the domain lock held.
  */
 static dma_addr_t __map_single(struct device *dev,