diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 19:30:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 19:30:00 +0200 |
| commit | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (patch) | |
| tree | b1edcfde47fcef004ca2c2901ed98d915ac00dbd | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22 (diff) | |
| parent | further UTF-8 fixes and name correction (diff) | |
| download | linux-1f8a6b658a943b4f04a1fc7b3a420360202c86cd.tar.xz linux-1f8a6b658a943b4f04a1fc7b3a420360202c86cd.zip | |
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
| -rw-r--r-- | CREDITS | 4 | ||||
| -rw-r--r-- | Documentation/kref.txt | 2 | ||||
| -rw-r--r-- | include/asm-m68k/atarihw.h | 2 | ||||
| -rw-r--r-- | include/asm-m68k/atariints.h | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -2299,8 +2299,8 @@ E: acme@redhat.com W: http://oops.ghostprotocols.net:81/blog/ P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks -S: R. Brasílio Itiberê, 4270/1010 - Água Verde -S: 80240-060 - Curitiba - Paraná +S: R. BrasÃlio Itiberê, 4270/1010 - Ãgua Verde +S: 80240-060 - Curitiba - Paraná S: Brazil N: Karsten Merker diff --git a/Documentation/kref.txt b/Documentation/kref.txt index 42fe28445916..f38b59d00c63 100644 --- a/Documentation/kref.txt +++ b/Documentation/kref.txt @@ -67,7 +67,7 @@ void more_data_handling(void *cb_data) . . do stuff with data here . - kref_put(data, data_release); + kref_put(&data->refcount, data_release); } int my_data_handler(void) 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 @@ ** linux/atarihw.h -- This header defines some macros and pointers for ** the various Atari custom hardware registers. ** -** Copyright 1994 by Bj”rn Brauel +** Copyright 1994 by Björn Brauel ** ** 5/1/94 Roman Hodek: ** 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 @@ /* ** atariints.h -- Atari Linux interrupt handling structs and prototypes ** -** Copyright 1994 by Bj”rn Brauel +** Copyright 1994 by Björn Brauel ** ** 5/2/94 Roman Hodek: ** TT interrupt definitions added. |