Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

* 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

Linus Torvalds 19 years ago 1f8a6b65 0c4ea957

+5 -5

4 changed files

expand all

CREDITS

Documentation

kref.txt

include

asm-m68k

atarihw.h

atariints.h

+2 -2

CREDITS

··· 2299 2299 W: http://oops.ghostprotocols.net:81/blog/ 2300 2300 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01 2301 2301 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks 2302 - S: R. Bras�lio Itiber�, 4270/1010 - �gua Verde 2303 - S: 80240-060 - Curitiba - Paran� 2302 + S: R. Brasílio Itiberê, 4270/1010 - Água Verde 2303 + S: 80240-060 - Curitiba - Paraná 2304 2304 S: Brazil 2305 2305 2306 2306 N: Karsten Merker

+1 -1

Documentation/kref.txt

··· 67 67 . 68 68 . do stuff with data here 69 69 . 70 - kref_put(data, data_release); 70 + kref_put(&data->refcount, data_release); 71 71 } 72 72 73 73 int my_data_handler(void)

+1 -1

include/asm-m68k/atarihw.h

··· 2 2 ** linux/atarihw.h -- This header defines some macros and pointers for 3 3 ** the various Atari custom hardware registers. 4 4 ** 5 - ** Copyright 1994 by Bjrn Brauel 5 + ** Copyright 1994 by Björn Brauel 6 6 ** 7 7 ** 5/1/94 Roman Hodek: 8 8 ** Added definitions for TT specific chips.

+1 -1

include/asm-m68k/atariints.h

··· 1 1 /* 2 2 ** atariints.h -- Atari Linux interrupt handling structs and prototypes 3 3 ** 4 - ** Copyright 1994 by Bjrn Brauel 4 + ** Copyright 1994 by Björn Brauel 5 5 ** 6 6 ** 5/2/94 Roman Hodek: 7 7 ** TT interrupt definitions added.