From: Graeme Russ <graeme.russ@gmail.com>
Date: Sat, 12 Feb 2011 04:11:26 +0000 (+1100)
Subject: x86: Fix mangled umlauts
X-Git-Tag: v2011.03-rc2~87
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9963a8216e12c2978b33ae1dd7233f4f78bfd0d2;p=platform%2Fkernel%2Fu-boot.git

x86: Fix mangled umlauts

git mergetool has a nasty habit of mangling umlats - fix ones that have
been missed in previous submissions
---

diff --git a/arch/i386/cpu/start.S b/arch/i386/cpu/start.S
index 829468f..ab9338a 100644
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -1,7 +1,7 @@
 /*
  *  U-boot - i386 Startup Code
  *
- *  Copyright (c) 2002	Omicron Ceti AB, Daniel Engstr�m <denaiel@omicron.se>
+ *  Copyright (c) 2002	Omicron Ceti AB, Daniel Engström <denaiel@omicron.se>
  *
  * See file CREDITS for list of people who contributed to this
  * project.
diff --git a/arch/i386/lib/board.c b/arch/i386/lib/board.c
index 30cb9a2..2cadce8 100644
--- a/arch/i386/lib/board.c
+++ b/arch/i386/lib/board.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Daniel Engstr�m, Omicron Ceti AB, daniel@omicron.se
+ * Daniel Engström, Omicron Ceti AB, daniel@omicron.se
  *
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.