[U-Boot] [PATCH 06/32] x86: Fix mangled umlauts

Graeme Russ graeme.russ at gmail.com
Fri Feb 4 13:35:33 CET 2011


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

Signed-off-by: Graeme Russ <graeme.russ at gmail.com>
---
 arch/i386/cpu/start.S |    2 +-
 arch/i386/lib/board.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 at omicron.se>
+ *  Copyright (c) 2002	Omicron Ceti AB, Daniel Engström <denaiel at 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 at omicron.se
+ * Daniel Engström, Omicron Ceti AB, daniel at omicron.se
  *
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-- 
1.7.1.422.g049e9



More information about the U-Boot mailing list