소스 검색

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
Linus Torvalds 18 년 전
부모
커밋
1f8a6b658a
4개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      CREDITS
  2. 1 1
      Documentation/kref.txt
  3. 1 1
      include/asm-m68k/atarihw.h
  4. 1 1
      include/asm-m68k/atariints.h

+ 2 - 2
CREDITS

@@ -2299,8 +2299,8 @@ E: acme@redhat.com
 W: http://oops.ghostprotocols.net:81/blog/
 W: http://oops.ghostprotocols.net:81/blog/
 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
 P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01
 D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
 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
 S: Brazil
 
 
 N: Karsten Merker
 N: Karsten Merker

+ 1 - 1
Documentation/kref.txt

@@ -67,7 +67,7 @@ void more_data_handling(void *cb_data)
 	.
 	.
 	. do stuff with data here
 	. do stuff with data here
 	.
 	.
-	kref_put(data, data_release);
+	kref_put(&data->refcount, data_release);
 }
 }
 
 
 int my_data_handler(void)
 int my_data_handler(void)

+ 1 - 1
include/asm-m68k/atarihw.h

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

+ 1 - 1
include/asm-m68k/atariints.h

@@ -1,7 +1,7 @@
 /*
 /*
 ** atariints.h -- Atari Linux interrupt handling structs and prototypes
 ** 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:
 ** 5/2/94 Roman Hodek:
 **   TT interrupt definitions added.
 **   TT interrupt definitions added.