aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS6
-rw-r--r--MAINTAINERS6
-rw-r--r--ipc/mqueue.c2
3 files changed, 6 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index 5b1edf3a38a2..7fb4c73e0228 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
3642S: USA 3642S: USA
3643 3643
3644N: Michal Wronski 3644N: Michal Wronski
3645E: wrona@mat.uni.torun.pl 3645E: Michal.Wronski@motorola.com
3646W: http://www.mat.uni.torun.pl/~wrona
3647D: POSIX message queues fs (with K. Benedyczak) 3646D: POSIX message queues fs (with K. Benedyczak)
3648S: ul. Teczowa 23/12 3647S: Krakow
3649S: 80-680 Gdansk-Sobieszewo
3650S: Poland 3648S: Poland
3651 3649
3652N: Frank Xia 3650N: Frank Xia
diff --git a/MAINTAINERS b/MAINTAINERS
index 3ccbfa96eeec..995bfd8e6e7f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2481,10 +2481,10 @@ L: linux-kernel@vger.kernel.org
2481S: Maintained 2481S: Maintained
2482 2482
2483TRIVIAL PATCHES 2483TRIVIAL PATCHES
2484P: Rusty Russell 2484P: Adrian Bunk
2485M: trivial@rustcorp.com.au 2485M: trivial@kernel.org
2486L: linux-kernel@vger.kernel.org 2486L: linux-kernel@vger.kernel.org
2487W: http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/ 2487W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
2488S: Maintained 2488S: Maintained
2489 2489
2490TMS380 TOKEN-RING NETWORK DRIVER 2490TMS380 TOKEN-RING NETWORK DRIVER
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index a0f18c9cc89d..c8943b53d8e6 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -2,7 +2,7 @@
2 * POSIX message queues filesystem for Linux. 2 * POSIX message queues filesystem for Linux.
3 * 3 *
4 * Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl) 4 * Copyright (C) 2003,2004 Krzysztof Benedyczak (golbi@mat.uni.torun.pl)
5 * Michal Wronski (wrona@mat.uni.torun.pl) 5 * Michal Wronski (Michal.Wronski@motorola.com)
6 * 6 *
7 * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com) 7 * Spinlocks: Mohamed Abbas (abbas.mohamed@intel.com)
8 * Lockless receive & send, fd based notify: 8 * Lockless receive & send, fd based notify: