lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Linus Torvalds
2005-11-07 09:01:32 -08:00
parent 333c47c847 b7c4a9f83f
commit 5b2f7ffcb7
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CREDITS
View File

@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
S: USA S: USA
N: Michal Wronski N: Michal Wronski
E: wrona@mat.uni.torun.pl E: Michal.Wronski@motorola.com
W: http://www.mat.uni.torun.pl/~wrona
D: POSIX message queues fs (with K. Benedyczak) D: POSIX message queues fs (with K. Benedyczak)
S: ul. Teczowa 23/12 S: Krakow
S: 80-680 Gdansk-Sobieszewo
S: Poland S: Poland
N: Frank Xia N: Frank Xia

6
MAINTAINERS
View File

@@ -2481,10 +2481,10 @@ L: linux-kernel@vger.kernel.org
S: Maintained S: Maintained
TRIVIAL PATCHES TRIVIAL PATCHES
P: Rusty Russell P: Adrian Bunk
M: trivial@rustcorp.com.au M: trivial@kernel.org
L: linux-kernel@vger.kernel.org L: linux-kernel@vger.kernel.org
W: http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/ W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
S: Maintained S: Maintained
TMS380 TOKEN-RING NETWORK DRIVER TMS380 TOKEN-RING NETWORK DRIVER

2
ipc/mqueue.c
View File

@@ -2,7 +2,7 @@
* POSIX message queues filesystem for Linux. * POSIX message queues filesystem for Linux.
* *
* Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl) * Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl)
* Michal Wronski (wrona@mat.uni.torun.pl) * Michal Wronski (Michal.Wronski@motorola.com)
* *
* Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
* Lockless receive & send, fd based notify: * Lockless receive & send, fd based notify: