summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:26 +1100
committerGraeme Russ <graeme.russ@gmail.com>2011-02-12 15:11:26 +1100
commit9963a8216e12c2978b33ae1dd7233f4f78bfd0d2 (patch)
treea7a70790866ceef02b368eef2fbafef0a42d2914
parent0640e4027261218571f87c825cd40e80b3871672 (diff)
downloadu-boot-imx-9963a8216e12c2978b33ae1dd7233f4f78bfd0d2.zip
u-boot-imx-9963a8216e12c2978b33ae1dd7233f4f78bfd0d2.tar.gz
u-boot-imx-9963a8216e12c2978b33ae1dd7233f4f78bfd0d2.tar.bz2
x86: Fix mangled umlauts
git mergetool has a nasty habit of mangling umlats - fix ones that have been missed in previous submissions
-rw-r--r--arch/i386/cpu/start.S2
-rw-r--r--arch/i386/lib/board.c2
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@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.