aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 13:30:00 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 13:30:00 -0400
commit1f8a6b658a943b4f04a1fc7b3a420360202c86cd (patch)
treeb1edcfde47fcef004ca2c2901ed98d915ac00dbd /include
parent0c4ea957c6ec953d84cc07346437abe0ae4bb57d (diff)
parent1039592d6fe3221c406b02d7341ef4212bc25020 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: further UTF-8 fixes and name correction Fix wrong identifier name in Documentation/kref.txt
Diffstat (limited to 'include')
-rw-r--r--include/asm-m68k/atarihw.h2
-rw-r--r--include/asm-m68k/atariints.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-m68k/atarihw.h b/include/asm-m68k/atarihw.h
index 6211363a345f..ecf007df7743 100644
--- a/include/asm-m68k/atarihw.h
+++ b/include/asm-m68k/atarihw.h
@@ -2,7 +2,7 @@
2** linux/atarihw.h -- This header defines some macros and pointers for 2** linux/atarihw.h -- This header defines some macros and pointers for
3** the various Atari custom hardware registers. 3** the various Atari custom hardware registers.
4** 4**
5** Copyright 1994 by Bj”rn Brauel 5** Copyright 1994 by Björn Brauel
6** 6**
7** 5/1/94 Roman Hodek: 7** 5/1/94 Roman Hodek:
8** Added definitions for TT specific chips. 8** Added definitions for TT specific chips.
diff --git a/include/asm-m68k/atariints.h b/include/asm-m68k/atariints.h
index ce6c445805bd..5748e99f4e26 100644
--- a/include/asm-m68k/atariints.h
+++ b/include/asm-m68k/atariints.h
@@ -1,7 +1,7 @@
1/* 1/*
2** atariints.h -- Atari Linux interrupt handling structs and prototypes 2** atariints.h -- Atari Linux interrupt handling structs and prototypes
3** 3**
4** Copyright 1994 by Bj”rn Brauel 4** Copyright 1994 by Björn Brauel
5** 5**
6** 5/2/94 Roman Hodek: 6** 5/2/94 Roman Hodek:
7** TT interrupt definitions added. 7** TT interrupt definitions added.