Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
This commit is contained in:
commit
5b2f7ffcb7
3 changed files with 6 additions and 8 deletions
6
CREDITS
6
CREDITS
|
@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
|
|||
S: USA
|
||||
|
||||
N: Michal Wronski
|
||||
E: wrona@mat.uni.torun.pl
|
||||
W: http://www.mat.uni.torun.pl/~wrona
|
||||
E: Michal.Wronski@motorola.com
|
||||
D: POSIX message queues fs (with K. Benedyczak)
|
||||
S: ul. Teczowa 23/12
|
||||
S: 80-680 Gdansk-Sobieszewo
|
||||
S: Krakow
|
||||
S: Poland
|
||||
|
||||
N: Frank Xia
|
||||
|
|
|
@ -2481,10 +2481,10 @@ L: linux-kernel@vger.kernel.org
|
|||
S: Maintained
|
||||
|
||||
TRIVIAL PATCHES
|
||||
P: Rusty Russell
|
||||
M: trivial@rustcorp.com.au
|
||||
P: Adrian Bunk
|
||||
M: trivial@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
|
||||
|
||||
TMS380 TOKEN-RING NETWORK DRIVER
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* POSIX message queues filesystem for Linux.
|
||||
*
|
||||
* 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)
|
||||
* Lockless receive & send, fd based notify:
|
||||
|
|
Loading…
Reference in a new issue