From 51bae8eb317dc7567c9aa7f8992c08011b520a57 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sat, 25 Mar 2006 16:30:16 +0100
Subject: [PATCH] --- yaml --- r: 23815 b: refs/heads/master c:
 e6fc99c6aba0350a3c4c0206b7047d4893491485 h: refs/heads/master i:   23813:
 92866af3393b6d8522055cb23a23da03306fa977   23811:
 5aacbff211050f9403e0c587ead7901a9fe11cd6   23807:
 133761bfd801d126ea8929bfe1ac220d6d32faab v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86_64/ia32/ia32_binfmt.c | 2 +-
 trunk/arch/x86_64/kernel/io_apic.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 79c7b0ce138d..b7d13656a353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04103609322daca31197068e310ba8037ecd3470
+refs/heads/master: e6fc99c6aba0350a3c4c0206b7047d4893491485
diff --git a/trunk/arch/x86_64/ia32/ia32_binfmt.c b/trunk/arch/x86_64/ia32/ia32_binfmt.c
index 572b3b28772d..e776139afb20 100644
--- a/trunk/arch/x86_64/ia32/ia32_binfmt.c
+++ b/trunk/arch/x86_64/ia32/ia32_binfmt.c
@@ -58,7 +58,7 @@ struct elf_phdr;
 
 #define USE_ELF_CORE_DUMP 1
 
-/* Overwrite elfcore.h */ 
+/* Override elfcore.h */ 
 #define _LINUX_ELFCORE_H 1
 typedef unsigned int elf_greg_t;
 
diff --git a/trunk/arch/x86_64/kernel/io_apic.c b/trunk/arch/x86_64/kernel/io_apic.c
index ffed464e6b12..f264d9dc97fe 100644
--- a/trunk/arch/x86_64/kernel/io_apic.c
+++ b/trunk/arch/x86_64/kernel/io_apic.c
@@ -310,7 +310,7 @@ void __init check_ioapic(void)
 					     force_iommu) &&
 					    !iommu_aperture_allowed) {
 						printk(KERN_INFO
-    "Looks like a VIA chipset. Disabling IOMMU. Overwrite with \"iommu=allowed\"\n");
+    "Looks like a VIA chipset. Disabling IOMMU. Override with \"iommu=allowed\"\n");
 						iommu_aperture_disabled = 1;
 					}
 #endif