Commit 1f8a6b65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0c4ea957 1039592d

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -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. Braslio 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

Documentation/kref.txt

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/asm-m68k/atarihw.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

include/asm-m68k/atariints.h

+1 −1
Original line number Diff line number Diff line 
/*

** 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.